[151997] trunk/dports/lang/perl5/files/5.22
mojca at macports.org
mojca at macports.org
Fri Aug 26 03:13:40 PDT 2016
Revision: 151997
https://trac.macports.org/changeset/151997
Author: mojca at macports.org
Date: 2016-08-26 03:13:39 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
perl5.22: cleanup patches, add a patch for removing the 10.3 target (#51980)
Modified Paths:
--------------
trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch
trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch
trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch
trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch
trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch
Added Paths:
-----------
trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch
Modified: trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/avoid-bind9-linking.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -2,16 +2,14 @@
loclibpth="$loclibpth /opt/local/lib/libgcc" ;;
which is new in 5.22 needs some special "treatment".
-Index: hints/darwin.sh
-===================================================================
--- hints/darwin.sh.orig
+++ hints/darwin.sh
-@@ -337,6 +337,8 @@ i_dbm=undef;
+@@ -338,7 +338,7 @@ i_dbm=undef;
+ # Configure doesn't detect ranlib on Tiger properly.
# NeilW says this should be acceptable on all darwin versions.
ranlib='ranlib'
-
+-
+libswanted="$(echo $libswanted | sed -e 's/bind //' -e 's/ bind//')"
-+
# Catch MacPorts gcc/g++ extra libdir
case "$($cc -v 2>&1)" in
*"MacPorts gcc"*) loclibpth="$loclibpth /opt/local/lib/libgcc" ;;
Modified: trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/avoid-no-cpp-precomp-PR38913.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -1,13 +1,11 @@
-Index: hints/darwin.sh
-===================================================================
--- hints/darwin.sh.orig
+++ hints/darwin.sh
-@@ -137,8 +137,6 @@ esac
+@@ -137,7 +137,7 @@ esac
# Avoid Apple's cpp precompiler, better for extensions
if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
- cppflags="${cppflags} -no-cpp-precomp"
--
++
+
# This is necessary because perl's build system doesn't
# apply cppflags to cc compile lines as it should.
- ccflags="${ccflags} ${cppflags}"
Modified: trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/clean-up-paths.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -1,5 +1,3 @@
-Index: Configure
-===================================================================
--- Configure.orig
+++ Configure
@@ -108,8 +108,8 @@ if test -d c:/. || ( uname -a | grep -i
@@ -13,7 +11,7 @@
paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-@@ -1404,7 +1404,7 @@ archobjs=''
+@@ -1405,7 +1405,7 @@ archobjs=''
archname=''
: Possible local include directories to search.
: Set locincpth to "" in a hint file to defeat local include searches.
@@ -22,7 +20,7 @@
locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
:
: no include file wanted by default
-@@ -1418,12 +1418,12 @@ libnames=''
+@@ -1419,12 +1419,12 @@ libnames=''
: change the next line if compiling for Xenix/286 on Xenix/386
xlibpth='/usr/lib/386 /lib/386'
: Possible local library directories to search.
Modified: trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/fix-miniperl-linking-PR36438.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -1,14 +1,11 @@
-Index: Makefile.SH
-===================================================================
--- Makefile.SH.orig
+++ Makefile.SH
-@@ -905,7 +905,8 @@ NAMESPACEFLAGS = -force_flat_namespace
+@@ -908,7 +908,7 @@ NAMESPACEFLAGS = -force_flat_namespace
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl
- at rm -f miniperl.xok
- $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
-+ unset LIBRARY_PATH && \
-+ $(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
++ unset LIBRARY_PATH && $(CC) $(subst -L__PREFIX__/lib,,$(CLDFLAGS)) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
$(mini_obj) $(libs)
$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
$(MINIPERL) -f write_buildcustomize.pl
Modified: trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch 2016-08-26 10:05:19 UTC (rev 151996)
+++ trunk/dports/lang/perl5/files/5.22/install-under-short-version-PR43480.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -19,7 +19,7 @@
*) set dflt privlib lib/$version ;;
esac
eval $prefixit
-@@ -7490,7 +7494,7 @@ siteprefixexp="$ansexp"
+@@ -7492,7 +7492,7 @@ siteprefixexp="$ansexp"
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$sitelib" in
'') case "$installstyle" in
Added: trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch
===================================================================
--- trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch (rev 0)
+++ trunk/dports/lang/perl5/files/5.22/remove-10.3-target-PR126360.patch 2016-08-26 10:13:39 UTC (rev 151997)
@@ -0,0 +1,142 @@
+https://trac.macports.org/ticket/51980
+https://rt.perl.org/Ticket/Display.html?id=126360
+https://rt.perl.org/Ticket/Display.html?id=128980
+http://perl5.git.perl.org/perl.git/commit/53d1d41c81e1de9cc6416dcae828c13d4c5a470a
+
+--- hints/darwin.sh.orig
++++ hints/darwin.sh
+@@ -186,30 +186,125 @@ case "$ld" in
+ ;;
+ esac
+
++# From http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mk/platform/Darwin.mk
++#
++# OS, Kernel, Xcode Version
++# Note that Xcode gets updates on older systems sometimes.
++# pkgsrc generally expects that the most up-to-date xcode available for
++# an OS version is installed
++#
++# Codename OS Kernel Xcode
++# Cheetah 10.0.x 1.3.1
++# Puma 10.1 1.4.1
++# 10.1.x 5.x.y
++# Jaguar 10.2.x 6.x.y
++# Panther 10.3.x 7.x.y
++# Tiger 10.4.x 8.x.y 2.x (gcc 4.0, 4.0.1 from 2.2)
++# Leopard 10.5.x 9.x.y 3.x (gcc 4.0.1, 4.0.1 and 4.2.1 from 3.1)
++# Snow Leopard 10.6.x 10.x.y 3.2+ (gcc 4.0.1 and 4.2.1)
++# Lion 10.7.x 11.x.y 4.1 (llvm gcc 4.2.1)
++# Mountain Lion 10.8.x 12.x.y 4.5 (llvm gcc 4.2.1)
++# Mavericks 10.9.x 13.x.y 6 (llvm clang 6.0)
++# Yosemite 10.10.x 14.x.y 6 (llvm clang 6.0)
++# El Capitan 10.11.x 15.x.y 7 (llvm clang 7.0)
++
++# MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support
++#
++# It is needed for OS releases before 10.6.
++#
++# https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
++#
++# If it is set, we also propagate its value to ccflags and ldflags
++# using the -mmacosx-version-min flag. If it is not set, we use
++# the OS X release as the min value for the flag.
++
++# Adds "-mmacosx-version-min=$2" to "$1" unless it already is there.
++add_macosx_version_min () {
++ local v
++ eval "v=\$$1"
++ case " $v " in
++ *"-mmacosx-version-min"*)
++ echo "NOT adding -mmacosx-version-min=$2 to $1 ($v)" >&4
++ ;;
++ *) echo "Adding -mmacosx-version-min=$2 to $1" >&4
++ eval "$1='$v -mmacosx-version-min=$2'"
++ ;;
++ esac
++}
++
+ # Perl bundles do not expect two-level namespace, added in Darwin 1.4.
+ # But starting from perl 5.8.1/Darwin 7 the default is the two-level.
+-case "$osvers" in
+-1.[0-3].*)
++case "$osvers" in # Note: osvers is the kernel version, not the 10.x
++1.[0-3].*) # OS X 10.0.x
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-1.*)
++1.*) # OS X 10.1
+ ldflags="${ldflags} -flat_namespace"
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-[2-6].*)
++[2-6].*) # OS X 10.1.x - 10.2.x (though [2-4] never existed publicly)
+ ldflags="${ldflags} -flat_namespace"
+ lddlflags="${ldflags} -bundle -undefined suppress"
+ ;;
+-*)
+- # MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support
+- # https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
++[7-9].*) # OS X 10.3.x - 10.5.x
+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
+ case "$ld" in
+- *MACOSX_DEVELOPMENT_TARGET*) ;;
++ *MACOSX_DEPLOYMENT_TARGET*) ;;
+ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
+ esac
+ ;;
++*) # OS X 10.6.x - current
++ # The MACOSX_DEPLOYMENT_TARGET is not needed,
++ # but the -mmacosx-version-min option is always used.
++
++ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
++ # capturing its value and adding it to the flags.
++ case "$MACOSX_DEPLOYMENT_TARGET" in
++ 10.*)
++ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
++ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
++ ;;
++ '')
++ # Empty MACOSX_DEPLOYMENT_TARGET is okay.
++ ;;
++ *)
++ cat <<EOM >&4
++
++*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
++***
++*** Please either set it to 10.something, or to empty.
++
++EOM
++ exit 1
++ ;;
++ esac
++
++ # Keep the prodvers leading whitespace (Configure magic).
++ # Cannot use $osvers here since that is the kernel version.
++ # sw_vers output what we want
++ # "ProductVersion: 10.10.5" "10.10"
++ # "ProductVersion: 10.11" "10.11"
++ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
++ case "$prodvers" in
++ 10.*)
++ add_macosx_version_min ccflags $prodvers
++ add_macosx_version_min ldflags $prodvers
++ ;;
++ *)
++ cat <<EOM >&4
++
++*** Unexpected product version $prodvers.
++***
++*** Try running sw_vers and see what its ProductVersion says.
++
++EOM
++ exit 1
++ esac
++
++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
++ ;;
+ esac
++
+ ldlibpthname='DYLD_LIBRARY_PATH';
+
+ # useshrplib=true results in much slower startup times.
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/d3542c6e/attachment.html>
More information about the macports-changes
mailing list