Date: Fri, 23 Aug 2013 16:24:05 +1000 (AEST) From: John Marshall <john.marshall@riverwillow.com.au> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/181481: [PATCH] irc/ircd-ratbox fix default options broken by optionsNG commit Message-ID: <201308230624.r7N6O5IE056229@rwsrv08.mby.riverwillow.net.au> Resent-Message-ID: <201308230640.r7N6e16c071985@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181481
>Category: ports
>Synopsis: [PATCH] irc/ircd-ratbox fix default options broken by optionsNG commit
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 23 06:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Marshall
>Release: FreeBSD 9.2-RC2 amd64
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwsrv08.mby.riverwillow.net.au 9.2-RC2 FreeBSD 9.2-RC2 #0 r254388: Fri Aug 16 11:31:09 AEST 2013 root@rwsrv08.mby.riverwillow.net.au:/usr/obj/usr/src/sys/RWSRV08 amd64
>Description:
r309810 included optionsNG conversion work which broke 3 of the 4
default options. This meant that, instead of IPv6 and Ziplinks being
enabled by default, it wasn't possible to build the port with either.
Fortunately, an incorrect (old) configure argument was used to disable
building with shared modules, so they still built anyway.
>How-To-Repeat:
make config (and twiddle the IPV6, ZIPLINKS and SHARED_MODS options)
make clean configure (and notice absolutely no difference in the report)
>Fix:
Added appropriate --enable-foo arguments.
The --disable-shared-modules configure argument is old, invalid, and
does nothing. The --enable-static option now provides that
functionality.
Also added MAKE_JOBS_UNSAFE to avoid intermittent build failures.
--- ircd-ratbox_324939.diff begins here ---
Index: irc/ircd-ratbox/Makefile
===================================================================
--- irc/ircd-ratbox/Makefile (revision 324939)
+++ irc/ircd-ratbox/Makefile (working copy)
@@ -20,6 +20,8 @@
USE_SQLITE= 3
USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox
+MAKE_JOBS_UNSAFE= yes
+
USERS= ircd
GROUPS= ${USERS}
@@ -70,15 +72,21 @@
.endif
.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+= --enable-ipv6
+.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
.if ${PORT_OPTIONS:MZIPLINKS}
+CONFIGURE_ARGS+= --enable-zlib
+.else
CONFIGURE_ARGS+= --disable-zlib
.endif
.if ${PORT_OPTIONS:MSHARED_MODS}
-CONFIGURE_ARGS+= --disable-shared-modules
+CONFIGURE_ARGS+= --disable-static
+.else
+CONFIGURE_ARGS+= --enable-static
.endif
.if ${PORT_OPTIONS:MASSERT}
--- ircd-ratbox_324939.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308230624.r7N6O5IE056229>