Thu Jan 26 06:33:43 2012 UTC ()
Add SET_LIBDIR variable which if non-empty will set GNU_CONFIGURE_LIBDIR to
the default libdir (and there for be passed to ./configure), this is the
best way to deal with the 'lib64' problem on x86_64-linux systems (with
most some packages).

Also add SET_LIBDIR, GNU_CONFIGURE_LIBDIR, and  GNU_CONFIGURE_LIBSUBDIR to
_PKG_VARS.gnu-configure


(sbd)
diff -r1.12 -r1.13 pkgsrc/mk/configure/gnu-configure.mk
cvs diff -r1.12 -r1.13 pkgsrc/mk/configure/gnu-configure.mk (expand / switch to unified diff)

--- pkgsrc/mk/configure/gnu-configure.mk 2012/01/17 21:19:43 1.12
+++ pkgsrc/mk/configure/gnu-configure.mk 2012/01/26 06:33:43 1.13
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: gnu-configure.mk,v 1.12 2012/01/17 21:19:43 sbd Exp $ 1# $NetBSD: gnu-configure.mk,v 1.13 2012/01/26 06:33:43 sbd Exp $
2 2
3_VARGROUPS+= gnu-configure 3_VARGROUPS+= gnu-configure
4_USER_VARS.gnu-configure= # none 4_USER_VARS.gnu-configure= # none
5_PKG_VARS.gnu-configure= GNU_CONFIGURE GNU_CONFIGURE_PREFIX \ 5_PKG_VARS.gnu-configure= GNU_CONFIGURE GNU_CONFIGURE_PREFIX \
 6 SET_LIBDIR GNU_CONFIGURE_LIBDIR GNU_CONFIGURE_LIBSUBDIR \
6 GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \ 7 GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
7 CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \ 8 CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
8 OVERRIDE_DIRDEPTH.configure \ 9 OVERRIDE_DIRDEPTH.configure \
9 USE_GNU_CONFIGURE_HOST 10 USE_GNU_CONFIGURE_HOST
10 11
11HAS_CONFIGURE= defined 12HAS_CONFIGURE= defined
12OVERRIDE_GNU_CONFIG_SCRIPTS= defined 13OVERRIDE_GNU_CONFIG_SCRIPTS= defined
13INSTALL_SH_OVERRIDE?= # empty 14INSTALL_SH_OVERRIDE?= # empty
14 15
15CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q} 16CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q}
16CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} 17CONFIGURE_ENV+= LIBS=${LIBS:M*:Q}
17CONFIGURE_ENV+= ac_given_INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP} 18CONFIGURE_ENV+= ac_given_INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP}
18 19
@@ -20,26 +21,28 @@ CONFIGURE_ENV+= ac_given_INSTALL=${INSTA @@ -20,26 +21,28 @@ CONFIGURE_ENV+= ac_given_INSTALL=${INSTA
20 defined(_OPSYS_MAX_CMDLEN_CMD) 21 defined(_OPSYS_MAX_CMDLEN_CMD)
21CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh} 22CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
22.endif 23.endif
23 24
24.if ${OPSYS} == "MirBSD" 25.if ${OPSYS} == "MirBSD"
25CONFIGURE_ENV+= lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$$' 26CONFIGURE_ENV+= lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$$'
26.endif 27.endif
27 28
28GNU_CONFIGURE_PREFIX?= ${PREFIX} 29GNU_CONFIGURE_PREFIX?= ${PREFIX}
29CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q} 30CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q}
30 31
31.if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR) 32.if defined(GNU_CONFIGURE_LIBSUBDIR) && !empty(GNU_CONFIGURE_LIBSUBDIR)
32GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR} 33GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib/${GNU_CONFIGURE_LIBSUBDIR}
 34.elif defined(SET_LIBDIR) && !empty(SET_LIBDIR)
 35GNU_CONFIGURE_LIBDIR= ${GNU_CONFIGURE_PREFIX}/lib
33.endif 36.endif
34.if defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR) 37.if defined(GNU_CONFIGURE_LIBDIR) && !empty(GNU_CONFIGURE_LIBDIR)
35CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR:Q} 38CONFIGURE_ARGS+= --libdir=${GNU_CONFIGURE_LIBDIR:Q}
36.endif 39.endif
37 40
38USE_GNU_CONFIGURE_HOST?= yes 41USE_GNU_CONFIGURE_HOST?= yes
39.if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS]) 42.if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS])
40. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 43. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
41CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q} 44CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q}
42. else 45. else
43CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q} 46CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
44. endif 47. endif
45CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 48CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}