diff options
Diffstat (limited to 'lang/perl5.18')
| -rw-r--r-- | lang/perl5.18/Makefile | 11 | ||||
| -rw-r--r-- | lang/perl5.18/files/patch-Makefile.SH | 17 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile index 8cae3d820a56..e5ed96f3692e 100644 --- a/lang/perl5.18/Makefile +++ b/lang/perl5.18/Makefile @@ -85,6 +85,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ -Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \ -Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \ -Dcc="${CC}" -Duseshrplib -Dinc_version_list=none +# Keep the following two in sync. +# lddlflags is used for all .so linking +# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags. +CONFIGURE_ARGS+= \ + -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \ + -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)' LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \ LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \ LC_TIME="" @@ -181,11 +187,6 @@ post-extract: post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh - # Keep the following two sync'ed - ${REINPLACE_CMD} -e 's|lddlflags="-shared "|lddlflags="-shared -L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl "|' \ - ${WRKSRC}/hints/freebsd.sh - ${REINPLACE_CMD} -e 's|%%HOLDER%%|:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl|' \ - ${WRKSRC}/Makefile.SH .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ diff --git a/lang/perl5.18/files/patch-Makefile.SH b/lang/perl5.18/files/patch-Makefile.SH index 1898e1614c1b..e3e79e773429 100644 --- a/lang/perl5.18/files/patch-Makefile.SH +++ b/lang/perl5.18/files/patch-Makefile.SH @@ -1,11 +1,10 @@ --- Makefile.SH.orig 2014-10-01 15:23:34 UTC +++ Makefile.SH -@@ -805,7 +805,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LI - true) - $spitshell >>$Makefile <<'!NO!SUBS!' - rm -f $@ -- $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) -+ $(LD) -o $@ $(SHRPLDFLAGS%%HOLDER%%) -Wl,-soname,$(LIBPERL:R) $(obj) $(DYNALOADER) $(libs) - !NO!SUBS! - case "$osname" in - aix) +@@ -40,7 +40,6 @@ esac + pwd="`pwd`" + linklibperl='$(LIBPERL)' + linklibperl_nonshr='' +-shrpldflags='$(LDDLFLAGS)' + ldlibpth='' + DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' + DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL' |