diff options
| author | mat <mat@FreeBSD.org> | 2015-03-25 01:05:25 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-03-25 01:05:25 +0800 |
| commit | 3a4898cd58932f3e8f185cc796ff3f1ce801b5cd (patch) | |
| tree | 042ba3f277aa0e3f40bc42c772f704dee8394249 /lang/perl5.20 | |
| parent | 9bb16a85ce7d8fda76567b96fc531ca4c1978d41 (diff) | |
| download | freebsd-ports-graphics-3a4898cd58932f3e8f185cc796ff3f1ce801b5cd.tar.gz freebsd-ports-graphics-3a4898cd58932f3e8f185cc796ff3f1ce801b5cd.tar.zst freebsd-ports-graphics-3a4898cd58932f3e8f185cc796ff3f1ce801b5cd.zip | |
Deorbit PTHREAD_{CFLAGS,LIBS} from Perl, and use -lpthread.
Sponsored by: Absolight
Diffstat (limited to 'lang/perl5.20')
| -rw-r--r-- | lang/perl5.20/Makefile | 6 | ||||
| -rw-r--r-- | lang/perl5.20/files/patch-hints__freebsd.sh | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile index 2d2ba4459cd..451fbcea31c 100644 --- a/lang/perl5.20/Makefile +++ b/lang/perl5.20/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 @@ -184,12 +184,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.20/files/patch-hints__freebsd.sh b/lang/perl5.20/files/patch-hints__freebsd.sh index 6f28b6babb5..4d169704040 100644 --- a/lang/perl5.20/files/patch-hints__freebsd.sh +++ b/lang/perl5.20/files/patch-hints__freebsd.sh @@ -38,15 +38,6 @@ lddlflags="-shared " cccdlflags='-DPIC -fPIC' ;; -@@ -144,7 +150,7 @@ case "$osvers" in - 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 @@ -191,7 +197,9 @@ esac # This script UU/usethreads.cbu will get 'called-back' by Configure |