svn commit: r414832 - in head: Mk Mk/Scripts lang/perl5-devel lang/perl5.18 lang/perl5.20 lang/perl5.22
Mathieu Arnold
mat at FreeBSD.org
Mon May 9 10:12:20 UTC 2016
Author: mat
Date: Mon May 9 10:12:18 2016
New Revision: 414832
URL: https://svnweb.freebsd.org/changeset/ports/414832
Log:
Try to simplify how libperl.so is looked for.
PR: 209123
Submitted by: mat
Exp-run by: antoine
With hat: perl@
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D6107
Modified:
head/Mk/Scripts/qa.sh (contents, props changed)
head/Mk/bsd.port.mk (contents, props changed)
head/lang/perl5-devel/Makefile (contents, props changed)
head/lang/perl5.18/Makefile (contents, props changed)
head/lang/perl5.20/Makefile (contents, props changed)
head/lang/perl5.22/Makefile (contents, props changed)
Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh Mon May 9 09:25:45 2016 (r414831)
+++ head/Mk/Scripts/qa.sh Mon May 9 10:12:18 2016 (r414832)
@@ -255,16 +255,19 @@ libperl() {
;;
*0)
has_some_libperl_so=1
- case "${found}" in
- *1?)
- warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
- ;;
- esac
- case "${found}" in
- 1??)
- warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
- ;;
- esac
+ # Older Perl did not USE_LDCONFIG.
+ if [ ! -f ${LOCALBASE}/${LDCONFIG_DIR}/perl5 ]; then
+ case "${found}" in
+ *1?)
+ warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
+ ;;
+ esac
+ case "${found}" in
+ 1??)
+ warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
+ ;;
+ esac
+ fi
;;
esac
# Use heredoc to avoid losing rc from find|while subshell
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon May 9 09:25:45 2016 (r414831)
+++ head/Mk/bsd.port.mk Mon May 9 10:12:18 2016 (r414832)
@@ -1520,6 +1520,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \
LOCALBASE=${LOCALBASE} \
"STRIP=${STRIP}" \
TMPPLIST=${TMPPLIST} \
+ LDCONFIG_DIR="${LDCONFIG_DIR}" \
PKGBASE=${PKGBASE}
.if !empty(USES:Mdesktop-file-utils)
QA_ENV+= USESDESKTOPFILEUTILS=yes
Modified: head/lang/perl5-devel/Makefile
==============================================================================
--- head/lang/perl5-devel/Makefile Mon May 9 09:25:45 2016 (r414831)
+++ head/lang/perl5-devel/Makefile Mon May 9 10:12:18 2016 (r414832)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= perl
-PORTREVISION= 0
+PORTREVISION= 1
# XXX Remove second line, uncomment first
#DISTVERSION= ${PERL_VERSION}
DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
@@ -109,8 +109,11 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX}
# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
# XXX change the soname to $$(LIBPERL:R)
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)'
+ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
+ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
+
+# Give a hint of where libperl.so can be found.
+USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
# XXX Remove
CONFIGURE_ARGS+= -Dusedevel -Uversiononly
Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile Mon May 9 09:25:45 2016 (r414831)
+++ head/lang/perl5.18/Makefile Mon May 9 10:12:18 2016 (r414832)
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -98,8 +98,12 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX}
# 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)'
+ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
+ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
+
+# Give a hint of where libperl.so can be found.
+USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
+
LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
LC_TIME=""
Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile Mon May 9 09:25:45 2016 (r414831)
+++ head/lang/perl5.20/Makefile Mon May 9 10:12:18 2016 (r414832)
@@ -3,7 +3,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0
DIST_SUBDIR= perl
@@ -92,8 +92,11 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX}
# 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)'
+ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
+ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
+
+# Give a hint of where libperl.so can be found.
+USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
Modified: head/lang/perl5.22/Makefile
==============================================================================
--- head/lang/perl5.22/Makefile Mon May 9 09:25:45 2016 (r414831)
+++ head/lang/perl5.22/Makefile Mon May 9 10:12:18 2016 (r414832)
@@ -3,6 +3,7 @@
PORTNAME= perl
DISTVERSION= ${PERL_VERSION}
+PORTREVISION= 1
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN/../../src/5.0 CPAN/../by-authors/id/S/SH/SHAY
DIST_SUBDIR= perl
@@ -90,8 +91,11 @@ CONFIGURE_ARGS= -sde -Dprefix=${PREFIX}
# 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)'
+ -Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
+ -Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
+
+# Give a hint of where libperl.so can be found.
+USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
More information about the svn-ports-all
mailing list