Sat Sep 12 00:52:45 2009 UTC ()
Always set both --host and --build, a number of programs want to use
a cross-compile like environment otherwise.


(joerg)
diff -r1.8 -r1.9 pkgsrc/mk/configure/gnu-configure.mk
cvs diff -r1.8 -r1.9 pkgsrc/mk/configure/gnu-configure.mk (expand / switch to unified diff)

--- pkgsrc/mk/configure/gnu-configure.mk 2008/11/29 12:29:35 1.8
+++ pkgsrc/mk/configure/gnu-configure.mk 2009/09/12 00:52:45 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gnu-configure.mk,v 1.8 2008/11/29 12:29:35 rillig Exp $ 1# $NetBSD: gnu-configure.mk,v 1.9 2009/09/12 00:52:45 joerg 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 GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \ 6 GNU_CONFIGURE_INFODIR GNU_CONFIGURE_MANDIR \
7 CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \ 7 CONFIGURE_HAS_MANDIR CONFIGURE_HAS_INFODIR \
8 OVERRIDE_DIRDEPTH.configure \ 8 OVERRIDE_DIRDEPTH.configure \
9 USE_GNU_CONFIGURE_HOST 9 USE_GNU_CONFIGURE_HOST
10 10
11HAS_CONFIGURE= defined 11HAS_CONFIGURE= defined
12OVERRIDE_GNU_CONFIG_SCRIPTS= defined 12OVERRIDE_GNU_CONFIG_SCRIPTS= defined
13INSTALL_SH_OVERRIDE?= # empty 13INSTALL_SH_OVERRIDE?= # empty
14 14
@@ -18,26 +18,28 @@ CONFIGURE_ENV+= ac_given_INSTALL=${INSTA @@ -18,26 +18,28 @@ CONFIGURE_ENV+= ac_given_INSTALL=${INSTA
18 18
19.if (defined(USE_LIBTOOL) || !empty(PKGPATH:Mdevel/libtool-base)) && \ 19.if (defined(USE_LIBTOOL) || !empty(PKGPATH:Mdevel/libtool-base)) && \
20 defined(_OPSYS_MAX_CMDLEN_CMD) 20 defined(_OPSYS_MAX_CMDLEN_CMD)
21CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh} 21CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
22.endif 22.endif
23 23
24GNU_CONFIGURE_PREFIX?= ${PREFIX} 24GNU_CONFIGURE_PREFIX?= ${PREFIX}
25CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q} 25CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q}
26 26
27USE_GNU_CONFIGURE_HOST?= yes 27USE_GNU_CONFIGURE_HOST?= yes
28.if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS]) 28.if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS])
29. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 29. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
30CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q} 30CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q}
 31. else
 32CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
31. endif 33. endif
32CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 34CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
33.endif 35.endif
34 36
35# PKGINFODIR is the subdirectory of ${PREFIX} into which the info 37# PKGINFODIR is the subdirectory of ${PREFIX} into which the info
36# files are installed unless the software was configured with an 38# files are installed unless the software was configured with an
37# installation prefix other than ${PREFIX}. 39# installation prefix other than ${PREFIX}.
38# 40#
39CONFIGURE_HAS_INFODIR?= yes 41CONFIGURE_HAS_INFODIR?= yes
40.if ${GNU_CONFIGURE_PREFIX} == ${PREFIX} 42.if ${GNU_CONFIGURE_PREFIX} == ${PREFIX}
41GNU_CONFIGURE_INFODIR?= ${GNU_CONFIGURE_PREFIX}/${PKGINFODIR} 43GNU_CONFIGURE_INFODIR?= ${GNU_CONFIGURE_PREFIX}/${PKGINFODIR}
42.else 44.else
43GNU_CONFIGURE_INFODIR?= ${GNU_CONFIGURE_PREFIX}/info 45GNU_CONFIGURE_INFODIR?= ${GNU_CONFIGURE_PREFIX}/info