sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang category: Remove $PTHREAD_LIBS

Browse source 
Note: ecl did not pass check-plist (pre-existing), PR 198897 submitted.

approved by:	PTHREAD blanket
This commit is contained in:
John Marino 2015-03-25 12:58:33 +00:00
parent 3580698ace
commit d945d5ea98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=382211
26 changed files with 38 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/afnix/Makefile
View file

@ -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}

12
lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
View file

@ -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 =

5
lang/ecl/Makefile
View file

@ -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/boehm-gc
.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>

4
lang/ferite/Makefile
View file

@ -18,8 +18,8 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \
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

1
lang/icon/Makefile
View file

@ -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

10
lang/ocaml/Makefile
View file

@ -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 bindings
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

4
lang/ofc/Makefile
View file

@ -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

2
lang/onyx/Makefile
View file

@ -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)

2
lang/php5/Makefile
View file

@ -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}

2
lang/php53/Makefile
View file

@ -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}

2
lang/php55/Makefile
View file

@ -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}

2
lang/php56/Makefile
View file

@ -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}

8
lang/pike78/Makefile
View file

@ -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|^|//|' \

3
lang/python27/Makefile
View file

@ -64,8 +64,7 @@ SEM_CONFIGURE_ENV= ac_cv_posix_semaphores_enabled=yes
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

3
lang/python32/Makefile
View file

@ -58,8 +58,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
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

3
lang/python33/Makefile
View file

@ -60,8 +60,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
PYMALLOC_CONFIGURE_WITH= pymalloc
THREADS_CONFIGURE_WITH= threads
THREADS_CFLAGS= ${PTHREAD_CFLAGS}
THREADS_LDFLAGS= ${PTHREAD_LIBS}
THREADS_LDFLAGS= -lpthread
TSC_CONFIGURE_WITH= tsc

3
lang/python34/Makefile
View file

@ -70,8 +70,7 @@ NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
PYMALLOC_CONFIGURE_WITH= pymalloc
THREADS_CONFIGURE_WITH= threads
THREADS_CFLAGS= ${PTHREAD_CFLAGS}
THREADS_LDFLAGS= ${PTHREAD_LIBS}
THREADS_LDFLAGS= -lpthread
TSC_CONFIGURE_WITH= tsc

4
lang/qore/Makefile
View file

@ -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

4
lang/ruby20/Makefile
View file

@ -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_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
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\},,' \

4
lang/ruby21/Makefile
View file

@ -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_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
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\},,' \

4
lang/ruby22/Makefile
View file

@ -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_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
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\},,' \

4
lang/scheme48/Makefile
View file

@ -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} \

4
lang/see/Makefile
View file

@ -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

2
lang/spidermonkey17/Makefile
View file

@ -17,7 +17,7 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr
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

3
lang/ypsilon/Makefile
View file

@ -13,8 +13,7 @@ COMMENT= Scheme implementation for real-time applications
USES= gmake
MAKE_ARGS= DATADIR="${DATADIR}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
MAKE_ARGS= DATADIR="${DATADIR}"
ONLY_FOR_ARCHS= i386 amd64

9
lang/ypsilon/files/patch-Makefile
View file

@ -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