diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.kde.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 57f5a3d49a10..6e714bf6394c 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -107,8 +107,6 @@ gnomeprefix_USE_GNOME_IMPL=gnomehier gnomeprefix_PREFIX=${LOCALBASE} .endif -gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}" diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index b286de84606e..27f64b3c1d56 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -57,9 +57,7 @@ CATEGORIES+=ipv6 ## XXX - This really belongs into bsd.port.mk .if !defined(_NO_KDE_CONFTARGET_HACK) -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --disable-as-needed .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f9b5ce83a443..3f391faf0553 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -882,7 +882,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # CONFIGURE_ARGS # - Pass these args to configure if ${HAS_CONFIGURE} is set. # Default: "--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} -# --mandir=${MANPREFIX}/man ${CONFIGURE_TARGET}" if +# --mandir=${MANPREFIX}/man --build=${CONFIGURE_TARGET}" if # GNU_CONFIGURE is set, "CC=${CC} CCFLAGS=${CFLAGS} # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib # INSTALLARCHLIB=${PREFIX}/lib" if PERL_CONFIGURE is set, @@ -2814,6 +2814,7 @@ PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX} CONFIGURE_SCRIPT?= configure CONFIGURE_TARGET?= ${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET:= ${CONFIGURE_TARGET:S/--build=//} CONFIGURE_LOG?= config.log # A default message to print if do-configure fails. @@ -2824,7 +2825,7 @@ CONFIGURE_FAIL_MESSAGE?= "Please report the problem to ${MAINTAINER} [maintainer .if !defined(CONFIGURE_MAX_CMD_LEN) CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax .endif -CONFIGURE_ARGS+= --prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET} +CONFIGURE_ARGS+= --prefix=${PREFIX} $${_LATE_CONFIGURE_ARGS} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} HAS_CONFIGURE= yes @@ -2835,6 +2836,11 @@ SET_LATE_CONFIGURE_ARGS= \ fi ; \ if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ + fi ; \ + if [ -z "`./${CONFIGURE_SCRIPT} --version 2>&1 | ${EGREP} '(2\.13|Unrecognized option)'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --build=${CONFIGURE_TARGET}" ; \ + else \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \ fi ; .endif |