diff options
| author | sbd <sbd> | 2012-01-17 21:10:24 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-01-17 21:10:24 +0000 |
| commit | 5085a49846ccd87389eb1aa9bc6924f80dc2aee7 (patch) | |
| tree | 1aa4b2ea592daea1abec754d7c7b6acbb81597c7 | |
| parent | 297c58aefbcaa945b719dbff28595ce0f3b54376 (diff) | |
| download | pkgsrc-5085a49846ccd87389eb1aa9bc6924f80dc2aee7.tar.gz | |
Add the GNU_CONFIGURE_LIBDIR variable, if defined it will be passed to gnu
configure scripts as the value of --libdir.
On Linux x86_64 set GNU_CONFIGURE_LIBDIR to ${GNU_CONFIGURE_PREFIX}/lib,
this will stop package trying to install into ${PREFIX}/lib64.
| -rw-r--r-- | mk/configure/gnu-configure.mk | 6 | ||||
| -rw-r--r-- | mk/platform/Linux.mk | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk index 1734fa167a9..e89dc56f016 100644 --- a/mk/configure/gnu-configure.mk +++ b/mk/configure/gnu-configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnu-configure.mk,v 1.10 2011/01/23 19:07:25 agc Exp $ +# $NetBSD: gnu-configure.mk,v 1.11 2012/01/17 21:10:24 sbd Exp $ _VARGROUPS+= gnu-configure _USER_VARS.gnu-configure= # none @@ -28,6 +28,10 @@ CONFIGURE_ENV+= lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+ GNU_CONFIGURE_PREFIX?= ${PREFIX} CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q} +.if defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR) +CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR:Q} +.endif + USE_GNU_CONFIGURE_HOST?= yes .if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS]) . if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 6a811a5ff35..7bf7b035241 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.45 2011/10/31 23:22:59 sbd Exp $ +# $NetBSD: Linux.mk,v 1.46 2012/01/17 21:10:24 sbd Exp $ # # Variable definitions for the Linux operating system. @@ -100,6 +100,7 @@ _OPSYS_MAX_CMDLEN_CMD?= /usr/bin/getconf ARG_MAX .endif .if (${MACHINE_ARCH} == "x86_64") +GNU_CONFIGURE_LIBDIR?= ${GNU_CONFIGURE_PREFIX}/lib ABI?= 64 LIBABISUFFIX?= 64 .endif |