user [email protected]
usertags 622051 multiarch
thanks
Here's one more patch, fixing problem with multiarch library locations.
It should be used with the following modification to debian/rules.
diff -Nru isakmpd-20041012/debian/rules isakmpd-20041012/debian/rules
--- isakmpd-20041012/debian/rules 2010-06-11 15:29:56.000000000 +0000
+++ isakmpd-20041012/debian/rules 2011-08-20 09:02:33.000000000 +0000
@@ -2,6 +2,8 @@
UPSTREAM_VERSION ?=20041012
b := $(CURDIR)/debian/isakmpd
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export MULTIARCHLIB := /usr/lib/$(DEB_HOST_MULTIARCH)
%:
dh $@
Description: Instead of hardcoded location of libraries, use the value
provided from debian/rules.
Author: Ilya Barygin <[email protected]>
--- isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
+++ isakmpd-20041012/sysdep/linux/GNUmakefile.sysdep
@@ -25,8 +25,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-LIBGMP:= /usr/lib/libgmp.a
-LIBCRYPTO:= /usr/lib/libcrypto.a
+LIBGMP:= ${MULTIARCHLIB}/libgmp.a
+LIBCRYPTO:= ${MULTIARCHLIB}/libcrypto.a
LIBSYSDEPDIR:= ${.CURDIR}/sysdep/common/libsysdep
LIBSYSDEP:= ${LIBSYSDEPDIR}/libsysdep.a
