aboutsummaryrefslogtreecommitdiff
path: root/lang/perl5.16
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-03-24 17:05:25 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-03-24 17:05:25 +0000
commitc0b425947d651ac5423ebe86942c88c6a64dc35a (patch)
tree042ba3f277aa0e3f40bc42c772f704dee8394249 /lang/perl5.16
parentc3744fffa7714dbcd05386435311fb174b6d2000 (diff)
downloadports-c0b425947d651ac5423ebe86942c88c6a64dc35a.tar.gz
ports-c0b425947d651ac5423ebe86942c88c6a64dc35a.zip
Deorbit PTHREAD_{CFLAGS,LIBS} from Perl, and use -lpthread.
Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=382125
Diffstat (limited to 'lang/perl5.16')
-rw-r--r--lang/perl5.16/Makefile6
-rw-r--r--lang/perl5.16/files/patch-hints__freebsd.sh9
2 files changed, 2 insertions, 13 deletions
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 8b54d3e99553..d3d8bdb49282 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -30,7 +30,7 @@ GDBM_DESC= GDBM_File extension
PERL_MALLOC_DESC= Use Perl malloc
PERL_64BITINT_DESC= Use 64 bit integers (on i386)
THREADS_DESC= Build threaded perl
-PTHREAD_DESC= Build with -pthread
+PTHREAD_DESC= Build with -lpthread
MULTIPLICITY_DESC= Use multiplicity
SITECUSTOMIZE_DESC= Run-time customization of @INC
USE_PERL_DESC= Rewrite links in /usr/bin
@@ -210,12 +210,10 @@ post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
.if ${PORT_OPTIONS:MPTHREAD}
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
- -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
+ ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
${WRKSRC}/hints/freebsd.sh
.else
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
- -e 's|%%PTHREAD_CFLAGS%%||g;' \
${WRKSRC}/hints/freebsd.sh
.endif
diff --git a/lang/perl5.16/files/patch-hints__freebsd.sh b/lang/perl5.16/files/patch-hints__freebsd.sh
index 42dd19c79b8c..56c1354ca021 100644
--- a/lang/perl5.16/files/patch-hints__freebsd.sh
+++ b/lang/perl5.16/files/patch-hints__freebsd.sh
@@ -38,15 +38,6 @@
lddlflags="-shared "
cccdlflags='-DPIC -fPIC'
;;
-@@ -143,7 +149,7 @@
- 0*|1*|2*|3*) ;;
-
- *)
-- ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+ ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- usenm=false
- fi
@@ -190,7 +196,9 @@
# This script UU/usethreads.cbu will get 'called-back' by Configure