Date: Tue, 24 Mar 2015 17:05:26 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382125 - in head/lang: perl5.16 perl5.16/files perl5.18 perl5.18/files perl5.20 perl5.20/files Message-ID: <201503241705.t2OH5Qt1076873@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Mar 24 17:05:25 2015 New Revision: 382125 URL: https://svnweb.freebsd.org/changeset/ports/382125 QAT: https://qat.redports.org/buildarchive/r382125/ Log: Deorbit PTHREAD_{CFLAGS,LIBS} from Perl, and use -lpthread. Sponsored by: Absolight Modified: head/lang/perl5.16/Makefile head/lang/perl5.16/files/patch-hints__freebsd.sh head/lang/perl5.18/Makefile head/lang/perl5.18/files/patch-hints__freebsd.sh head/lang/perl5.20/Makefile head/lang/perl5.20/files/patch-hints__freebsd.sh Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.16/Makefile Tue Mar 24 17:05:25 2015 (r382125) @@ -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 Modified: head/lang/perl5.16/files/patch-hints__freebsd.sh ============================================================================== --- head/lang/perl5.16/files/patch-hints__freebsd.sh Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.16/files/patch-hints__freebsd.sh Tue Mar 24 17:05:25 2015 (r382125) @@ -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 Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.18/Makefile Tue Mar 24 17:05:25 2015 (r382125) @@ -31,7 +31,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 @@ -188,12 +188,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 Modified: head/lang/perl5.18/files/patch-hints__freebsd.sh ============================================================================== --- head/lang/perl5.18/files/patch-hints__freebsd.sh Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.18/files/patch-hints__freebsd.sh Tue Mar 24 17:05:25 2015 (r382125) @@ -38,15 +38,6 @@ lddlflags="-shared " cccdlflags='-DPIC -fPIC' ;; -@@ -144,7 +150,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 @@ -191,7 +197,9 @@ # This script UU/usethreads.cbu will get 'called-back' by Configure Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.20/Makefile Tue Mar 24 17:05:25 2015 (r382125) @@ -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 Modified: head/lang/perl5.20/files/patch-hints__freebsd.sh ============================================================================== --- head/lang/perl5.20/files/patch-hints__freebsd.sh Tue Mar 24 17:02:43 2015 (r382124) +++ head/lang/perl5.20/files/patch-hints__freebsd.sh Tue Mar 24 17:05:25 2015 (r382125) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241705.t2OH5Qt1076873>