diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2014-10-29 09:41:47 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2014-10-29 09:41:47 +0000 |
| commit | 519d5660effaf3ed8eb4ff505d118bb0f50882f0 (patch) | |
| tree | 58d25bcfc83952d11f99893a2757a73ebe627668 /irc/irc | |
| parent | 1a75390672f6933a3d9a053615ad0db3deaea641 (diff) | |
| download | ports-519d5660effaf3ed8eb4ff505d118bb0f50882f0.tar.gz ports-519d5660effaf3ed8eb4ff505d118bb0f50882f0.zip | |
The IRC configure script has curious logic, is being overly complex,
and actually breaks badly if the port is being built in a chroot
where the host triplet won't match the jail triplet.
The solution I've provided here is clean. Using the pre-configure
target, the build directory (with a fixed name) is created and the
needed configure script and header are copied over, just like the top
configure script does. Then the port makefile just configures with
that. It's much better, more robust, and fixes the triplet mismatch.
PR: 194679
Submitted by: marino
Notes
Notes:
svn path=/head/; revision=371671
Diffstat (limited to 'irc/irc')
| -rw-r--r-- | irc/irc/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/irc/irc/Makefile b/irc/irc/Makefile index 017300ed3ddb..cb7e93ac83a3 100644 --- a/irc/irc/Makefile +++ b/irc/irc/Makefile @@ -19,11 +19,17 @@ CONFLICTS_INSTALL= charybdis-[0-9]* ircd-hybrid-[0-9]* Nefarious-[0-9]* \ USE_RC_SUBR= ircd GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/ircd -BUILD_WRKSRC= ${WRKSRC}/${MACHINE_ARCH}-unknown-${OPSYS:tl}${OSREL} -INSTALL_WRKSRC= ${BUILD_WRKSRC} +BUILD_WRKSRC= ${WRKSRC}/build +INSTALL_WRKSRC= ${BUILD_WRKSRC} +CONFIGURE_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 IPV6_CONFIGURE_ENABLE= ipv6 +pre-configure: + @${MKDIR} ${BUILD_WRKSRC} + ${CP} -p ${WRKSRC}/support/configure ${BUILD_WRKSRC} + ${CP} -p ${WRKSRC}/support/config.h.dist ${BUILD_WRKSRC}/config.h + .include <bsd.port.mk> |