svn commit: r382211 - in head/lang: afnix afnix/files ecl ferite icon ocaml ofc onyx php5 php53 php55 php56 pike78 python27 python32 python33 python34 qore ruby20 ruby21 ruby22 scheme48 see spiderm...
John Marino
marino at FreeBSD.org
Wed Mar 25 12:58:44 UTC 2015
Author: marino
Date: Wed Mar 25 12:58:33 2015
New Revision: 382211
URL: https://svnweb.freebsd.org/changeset/ports/382211
QAT: https://qat.redports.org/buildarchive/r382211/
Log:
lang category: Remove $PTHREAD_LIBS
Note: ecl did not pass check-plist (pre-existing), PR 198897 submitted.
approved by: PTHREAD blanket
Modified:
head/lang/afnix/Makefile
head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
head/lang/ecl/Makefile
head/lang/ferite/Makefile
head/lang/icon/Makefile
head/lang/ocaml/Makefile
head/lang/ofc/Makefile
head/lang/onyx/Makefile
head/lang/php5/Makefile
head/lang/php53/Makefile
head/lang/php55/Makefile
head/lang/php56/Makefile
head/lang/pike78/Makefile
head/lang/python27/Makefile
head/lang/python32/Makefile
head/lang/python33/Makefile
head/lang/python34/Makefile
head/lang/qore/Makefile
head/lang/ruby20/Makefile
head/lang/ruby21/Makefile
head/lang/ruby22/Makefile
head/lang/scheme48/Makefile
head/lang/see/Makefile
head/lang/spidermonkey17/Makefile
head/lang/ypsilon/Makefile
head/lang/ypsilon/files/patch-Makefile
Modified: head/lang/afnix/Makefile
==============================================================================
--- head/lang/afnix/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/afnix/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -17,8 +17,6 @@ HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= cnf/bin/afnix-setup
CONFIGURE_ARGS= -o --prefix "${PREFIX}" --altdir "${PREFIX}" \
--shrdir "${PREFIX}/share" --compiler clang++
-MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
PORTDOCS= *
PLIST_SUB= PORTVER=${PORTVERSION:R}
Modified: head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
==============================================================================
--- head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak Wed Mar 25 12:58:33 2015 (r382211)
@@ -1,6 +1,6 @@
---- cnf/mak/afnix-clg4.mak.orig 2015-01-09 13:27:16.000000000 +0100
-+++ cnf/mak/afnix-clg4.mak 2015-01-09 13:28:08.000000000 +0100
-@@ -19,23 +19,23 @@
+--- cnf/mak/afnix-clg4.mak.orig 2015-01-03 13:34:32 UTC
++++ cnf/mak/afnix-clg4.mak
+@@ -19,18 +19,18 @@
# - compiler and linker section -
# ----------------------------------------------------------------------------
@@ -24,9 +24,3 @@
PFLCCFLAGS =
COVCCFLAGS =
CPPCCFLAGS = -nostdinc -nostdinc++
- CXXCCFLAGS =
--STDDEFINES =
-+STDDEFINES = $(PTHREAD_CFLAGS)
- DBGDEFINES = -DAFNIX_DEBUG
- OPTDEFINES =
- PFLDEFINES =
Modified: head/lang/ecl/Makefile
==============================================================================
--- head/lang/ecl/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ecl/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=--with-dffi=no
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads=yes
-LDFLAGS+= ${PTHREAD_LIBS}
+LDFLAGS+= -lpthread
LIB_DEPENDS+= libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
.else
CONFIGURE_ARGS+=--enable-threads=no
@@ -79,8 +79,7 @@ LIB_DEPENDS+= libgc.so:${PORTSDIR}/devel
.if ${PORT_OPTIONS:MTHREADS}
post-patch:
- @${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' \
- -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/src/configure
+ @${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' ${WRKSRC}/src/configure
.endif
.include <bsd.port.post.mk>
Modified: head/lang/ferite/Makefile
==============================================================================
--- head/lang/ferite/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ferite/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -18,8 +18,8 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve
USES= gmake libtool
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
USE_LDCONFIG= yes
PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH}
INSTALL_TARGET= install-strip
Modified: head/lang/icon/Makefile
==============================================================================
--- head/lang/icon/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/icon/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -38,7 +38,6 @@ post-patch:
@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
s|/usr/X11R6|${LOCALBASE}|g ; \
- s|-lpthread|${PTHREAD_LIBS}| ; \
s|^XLIBS.*|XLIBS=-L${LOCALBASE}/lib -lX11|g" \
${WRKSRC}/config/${ARCH_NAME}/Makedefs
@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
Modified: head/lang/ocaml/Makefile
==============================================================================
--- head/lang/ocaml/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ocaml/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -71,11 +71,9 @@ CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"
.if ${PORT_OPTIONS:MTHREADS}
PLIST_SUB+= THREADS=""
-THR_CPP= ${PTHREAD_CFLAGS}
-THR_LD= ${PTHREAD_LIBS}
+THR_LD= -lpthread
.else
PLIST_SUB+= THREADS="@comment "
-THR_CPP= #empty
THR_LD= #empty
CONFIGURE_ARGS+=-no-pthread
.endif
@@ -102,7 +100,7 @@ IGNORE=requires X11 support to build TK
USES+= tk:84+
PLIST_SUB+= TK=""
CONFIGURE_ARGS+= -tkdefs \
- "-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
+ "-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \
-ltcl${TCL_VER:S|.||} ${THR_LD}"
.else
@@ -159,8 +157,8 @@ post-patch:
post-configure:
# CFLAGS safeness
@${REINPLACE_CMD} -E \
- -e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
- -e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
+ -e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
+ -e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
${WRKSRC}/config/Makefile
Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ofc/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -20,8 +20,8 @@ USE_SDL= sdl
USES= libtool objc pathfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= GDBM GMP
Modified: head/lang/onyx/Makefile
==============================================================================
--- head/lang/onyx/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/onyx/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -29,8 +29,6 @@ PLIST_SUB= ONYX_VERSION=${PORTVERSION}
BROKEN_ia64= Coredump during build on ia64
.include <bsd.port.options.mk>
-post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
do-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook)
Modified: head/lang/php5/Makefile
==============================================================================
--- head/lang/php5/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/php5/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -143,7 +143,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \
lt_cv_path_SED="sed"
.if ${PORT_OPTIONS:MLINKTHR}
-LIBS+= ${PTHREAD_LIBS}
+LIBS+= -lpthread
.endif
.if ${PORT_OPTIONS:MZTS}
Modified: head/lang/php53/Makefile
==============================================================================
--- head/lang/php53/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/php53/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -141,7 +141,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \
lt_cv_path_SED="sed"
.if ${PORT_OPTIONS:MLINKTHR}
-LIBS+= ${PTHREAD_LIBS}
+LIBS+= -lpthread
.endif
.if ${PORT_OPTIONS:MDEBUG}
Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php55/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/php55/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -143,7 +143,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \
lt_cv_path_SED="sed"
.if ${PORT_OPTIONS:MLINKTHR}
-LIBS+= ${PTHREAD_LIBS}
+LIBS+= -lpthread
.endif
.if ${PORT_OPTIONS:MDEBUG}
Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/php56/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -146,7 +146,7 @@ CONFIGURE_ENV+= ac_cv_pthreads_lib="" \
lt_cv_path_SED="sed"
.if ${PORT_OPTIONS:MLINKTHR}
-LIBS+= ${PTHREAD_LIBS}
+LIBS+= -lpthread
.endif
.if ${PORT_OPTIONS:MDEBUG}
Modified: head/lang/pike78/Makefile
==============================================================================
--- head/lang/pike78/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/pike78/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -38,9 +38,9 @@ PGSQL_CONFIGURE_WITH= pgsql
CFLAGS+= -ffast-math -fomit-frame-pointer
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS+=${PTHREAD_CFLAGS} M4="/usr/bin/m4 -g"
+CONFIGURE_ENV= M4="/usr/bin/m4 -g"
CONFIGURE_ARGS+= --without-debug \
- --with-thread-library=${PTHREAD_LIBS} \
+ --with-thread-library="-lpthread" \
--with-double-precision \
--with-long-double-precision \
--disable-rpath \
@@ -94,8 +94,8 @@ post-patch:
${WRKSRC}/src/modules/Gmp/configure ${WRKSRC}/src/modules/_Image_XFace/configure
@${REINPLACE_CMD} -e '/memchr_memcmp.*needle/s/^/static /' \
${WRKSRC}/src/pike_search_engine2.c
- @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
- -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%||' \
+ -e 's|%%PTHREAD_LIBS%%|-lpthread|' \
-e 's|,-Bshareable|& -shared|' \
${WRKSRC}/src/configure
@${REINPLACE_CMD} -e '/install.*MANDIR/s|^|//|' \
Modified: head/lang/python27/Makefile
==============================================================================
--- head/lang/python27/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/python27/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -64,8 +64,7 @@ SEM_CONFIGURE_ENV= ac_cv_posix_semaphore
SEM_CONFIGURE_ENV_OFF= ac_cv_posix_semaphores_enabled=no
THREADS_CONFIGURE_WITH= threads
-THREADS_CFLAGS= ${PTHREAD_CFLAGS}
-THREADS_LDFLAGS= ${PTHREAD_LIBS}
+THREADS_LDFLAGS= -lpthread
UCS2_CONFIGURE_ON= --enable-unicode=ucs2
UCS4_CONFIGURE_ON= --enable-unicode=ucs4
Modified: head/lang/python32/Makefile
==============================================================================
--- head/lang/python32/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/python32/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -58,8 +58,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_te
PYMALLOC_CONFIGURE_WITH= pymalloc
THREADS_CONFIGURE_WITH= threads
-THREADS_CFLAGS= ${PTHREAD_CFLAGS}
-THREADS_LDFLAGS= ${PTHREAD_LIBS}
+THREADS_LDFLAGS= -lpthread
TSC_CONFIGURE_WITH= tsc
UCS4_CONFIGURE_WITH= wide-unicode
Modified: head/lang/python33/Makefile
==============================================================================
--- head/lang/python33/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/python33/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -60,8 +60,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_te
PYMALLOC_CONFIGURE_WITH= pymalloc
THREADS_CONFIGURE_WITH= threads
-THREADS_CFLAGS= ${PTHREAD_CFLAGS}
-THREADS_LDFLAGS= ${PTHREAD_LIBS}
+THREADS_LDFLAGS= -lpthread
TSC_CONFIGURE_WITH= tsc
Modified: head/lang/python34/Makefile
==============================================================================
--- head/lang/python34/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/python34/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -70,8 +70,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_te
PYMALLOC_CONFIGURE_WITH= pymalloc
THREADS_CONFIGURE_WITH= threads
-THREADS_CFLAGS= ${PTHREAD_CFLAGS}
-THREADS_LDFLAGS= ${PTHREAD_LIBS}
+THREADS_LDFLAGS= -lpthread
TSC_CONFIGURE_WITH= tsc
Modified: head/lang/qore/Makefile
==============================================================================
--- head/lang/qore/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/qore/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -21,9 +21,7 @@ USE_OPENSSL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LEX="${LOCALBASE}/bin/flex" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTRHEAD_CFLAGS}"
+CONFIGURE_ENV= LEX="${LOCALBASE}/bin/flex" PTHREAD_LIBS="-lpthread"
CONFIGURE_ARGS= --disable-debug --disable-static --with-doxygen=no
LDFLAGS+= -L${LOCALBASE}/lib
Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ruby20/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -83,7 +83,7 @@ _SUF1= _${PORTREVISION}
CPPFLAGS+= -I${LOCALBASE}/include
# Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+= -lpthread -L${LOCALBASE}/lib
.if ${OPSYS} == "FreeBSD"
.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386")
@@ -137,7 +137,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CM
post-patch:
@${REINPLACE_CMD} -E \
- -e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+ -e 's,-l$$pthread_lib,-lpthread,g' \
-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
Modified: head/lang/ruby21/Makefile
==============================================================================
--- head/lang/ruby21/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ruby21/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -82,7 +82,7 @@ _SUF1= _${PORTREVISION}
CPPFLAGS+= -I${LOCALBASE}/include
# Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+= -lpthread -L${LOCALBASE}/lib
.if ${OPSYS} == "FreeBSD"
.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
@@ -132,7 +132,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CM
post-patch:
@${REINPLACE_CMD} -E \
- -e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+ -e 's,-l$$pthread_lib,-lpthread,g' \
-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
Modified: head/lang/ruby22/Makefile
==============================================================================
--- head/lang/ruby22/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ruby22/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -82,7 +82,7 @@ _SUF1= _${PORTREVISION}
CPPFLAGS+= -I${LOCALBASE}/include
# Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+= -lpthread -L${LOCALBASE}/lib
.if ${OPSYS} == "FreeBSD"
.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
@@ -132,7 +132,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CM
post-patch:
@${REINPLACE_CMD} -E \
- -e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+ -e 's,-l$$pthread_lib,-lpthread,g' \
-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
Modified: head/lang/scheme48/Makefile
==============================================================================
--- head/lang/scheme48/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/scheme48/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -26,8 +26,8 @@ PLIST_SUB+= VER=${PORTVERSION}
post-patch:
@${REINPLACE_CMD} \
- -e 's/-mthreads/${PTHREAD_LIBS}/' \
- -e 's/-mt/${PTHREAD_LIBS}/' \
+ -e 's/-mthreads/-lpthread/' \
+ -e 's/-mt/-lpthread/' \
-e 's/-munaligned-double//' \
${WRKSRC}/configure
@${REINPLACE_CMD} \
Modified: head/lang/see/Makefile
==============================================================================
--- head/lang/see/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/see/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -31,8 +31,8 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CFLAGS+= -O3
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -lpthread -L${LOCALBASE}/lib
DEBUG_CFLAGS_OFF= -DNDEBUG
GC_LIB_DEPENDS= libgc.so:${PORTSDIR}/devel/boehm-gc
Modified: head/lang/spidermonkey17/Makefile
==============================================================================
--- head/lang/spidermonkey17/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/spidermonkey17/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -17,7 +17,7 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/dev
CONFLICTS= njs-[0-9]*
MAKE_ARGS+= JS_THREADSAFE=YES \
- PROG_LIBS="-lreadline -ltermcap -lm ${PTHREAD_LIBS}" \
+ PROG_LIBS="-lreadline -ltermcap -lm -lpthread" \
LDFLAGS="-L${LOCALBASE}/lib"
CFLAGS+= -I${LOCALBASE}/include/nspr
Modified: head/lang/ypsilon/Makefile
==============================================================================
--- head/lang/ypsilon/Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ypsilon/Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -13,8 +13,7 @@ COMMENT= Scheme implementation for real-
USES= gmake
-MAKE_ARGS= DATADIR="${DATADIR}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ARGS= DATADIR="${DATADIR}"
ONLY_FOR_ARCHS= i386 amd64
Modified: head/lang/ypsilon/files/patch-Makefile
==============================================================================
--- head/lang/ypsilon/files/patch-Makefile Wed Mar 25 12:56:56 2015 (r382210)
+++ head/lang/ypsilon/files/patch-Makefile Wed Mar 25 12:58:33 2015 (r382211)
@@ -33,15 +33,6 @@
ifeq ($(DATAMODEL), ILP32)
CPPFLAGS += -DDEFAULT_HEAP_LIMIT=32
CXXFLAGS += -m32
-@@ -82,7 +71,7 @@
- ASFLAGS = --64
- SRCS += ffi_stub_freebsd64.s
- endif
-- LDLIBS = -pthread
-+ LDLIBS = ${PTHREAD_LIBS}
- endif
-
- ifneq (, $(findstring OpenBSD, $(UNAME)))
@@ -123,7 +112,6 @@
.PHONY: all install uninstall sitelib stdlib check bench clean distclean
More information about the svn-ports-head
mailing list