tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkgsrc frozen as of now



Hi

instead of 

On Sat, Dec 21, 2013 at 08:24:34PM +0100, Ignatios Souvatzis wrote:

> So they're opting to make this new code user-(well, admin) selectable.

I should have written "de-selectable".

> We really should move it to an pkg option, and offer it depending on
> machine/os; but I won't do *that* at freeze time. Too much code.

Here's my quick patch; make test-ed in an unaffected (i386 netbsd-6.1)
as well as an affected (shark 5.1.3_PATCH) environemnt. Any comments
ere I commit?

        -is

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile    8 Jun 2013 06:48:24 -0000       1.57
+++ Makefile    23 Dec 2013 13:07:20 -0000
@@ -25,6 +25,20 @@
 PTHREAD_OPTS+=         require native
 CONFIGURE_ARGS+=       --enable-threads
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
+.if    empty(MACHINE_PLATFORM:M*i386)  ||\
+       empty(MACHINE_PLATFORM:M*sparc) ||\
+       empty(MACHINE_PLATFORM:M*sparc64) ||\
+       empty(MACHINE_PLATFORM:M*powerpc) ||\
+       empty(MACHINE_PLATFORM:M*x86_64)
+
+CONFIGURE_ARGS+=       --disable-native-ethr-impls
+
+.endif
+.endif
+
 MAKE_ENV+=             DESTDIR=${DESTDIR}
 
 REPLACE_INTERPRETER+=  escript
@@ -51,8 +65,6 @@
 
 PLIST_SRC=             PLIST
 
-.include "../../mk/bsd.prefs.mk"
-
 .if exists(${.CURDIR}/PLIST.${OPSYS})
 PLIST_SRC+=    ${.CURDIR}/PLIST.${OPSYS}
 .endif


Home | Main Index | Thread Index | Old Index