From 2d897f1d2fef21f0040b748d04610d9ecbf00d1d Mon Sep 17 00:00:00 2001
From: mat <mat@FreeBSD.org>
Date: Wed, 24 Dec 2014 17:14:11 +0000
Subject: Use a less kludgy way for handling libperl.so's versionning and
linking.
Sponsored by: Absolight
---
lang/perl5.20/Makefile | 11 ++++++-----
lang/perl5.20/files/patch-Makefile.SH | 17 ++++++++---------
2 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'lang/perl5.20')
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index bc843c72dd5..8d20d9e196c 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -85,6 +85,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
-Dsiteman1dir=${PREFIX}/man/man1 \
-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)'
# When upgrading to 5.22+ remove this.
CONFIGURE_ARGS+= \
-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
@@ -178,11 +184,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.20/files/patch-Makefile.SH b/lang/perl5.20/files/patch-Makefile.SH
index 0b16689eda3..ee625db7951 100644
--- a/lang/perl5.20/files/patch-Makefile.SH
+++ b/lang/perl5.20/files/patch-Makefile.SH
@@ -1,11 +1,10 @@
--- Makefile.SH.orig 2014-09-14 11:30:59 UTC
+++ Makefile.SH
-@@ -838,7 +838,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)
+@@ -31,7 +31,6 @@ esac
+ pwd="`pwd`"
+ linklibperl='$(LIBPERL)'
+ linklibperl_nonshr=''
+-shrpldflags='$(LDDLFLAGS)'
+ ldlibpth=''
+ DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB'
+ DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL'
--
cgit