From b7e38d407dd29f43d24e26965ef41d45d60d9fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Sat, 24 Oct 2015 13:41:48 +0200 Subject: [PATCH] perl: Updated (5.18.2 -> 5.20.2) --- perl/perl/perl.conf | 11 +++++++- perl/perl/perl.desc | 8 +++--- perl/perl/pthreads_hotfix.patch | 43 ------------------------------- perl/perl/typo_hotfix.patch | 45 --------------------------------- 4 files changed, 14 insertions(+), 93 deletions(-) delete mode 100644 perl/perl/pthreads_hotfix.patch delete mode 100644 perl/perl/typo_hotfix.patch diff --git a/perl/perl/perl.conf b/perl/perl/perl.conf index 17ccfd057..8f34a5160 100644 --- a/perl/perl/perl.conf +++ b/perl/perl/perl.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../perl/perl.conf -# Copyright (C) 2012 - 2014 The OpenSDE Project +# Copyright (C) 2012 - 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -43,3 +43,12 @@ fi if [ "$SDECFG_PKG_PERL5_THREADS" = "1" ]; then var_append extraconfopt ' ' "-Dusethreads" fi + +# we make LD=gcc because of: +# https://github.com/arsv/perl-cross/commit/98f631b66fac0d1f7bce0918ac4c6addb4db1ebd +if atstage cross; then + LD="$root/TOOLCHAIN/$toolsdir/crosscc/$CC" +else + LD="$CC" +fi + diff --git a/perl/perl/perl.desc b/perl/perl/perl.desc index ec7afbd6f..82d5001cc 100644 --- a/perl/perl/perl.desc +++ b/perl/perl/perl.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../perl/perl.desc -[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] @@ -33,8 +33,8 @@ [L] GPL Artistic [S] Stable -[V] 5.18.2 +[V] 5.20.2 [P] X -1-3---7-9 102.000 -[D] 486073295 perl-5.18.2.tar.gz http://www.cpan.org/src/5.0/ -[D] 73736219 perl-5.18.2-cross-0.8.5.tar.gz https://raw.github.com/arsv/perl-cross/releases/ +[D] 4282364038 perl-5.20.2.tar.gz http://www.cpan.org/src/5.0/ +[D] 383924659 perl-5.20.2-cross-0.9.7.tar.gz https://raw.github.com/arsv/perl-cross/releases/ diff --git a/perl/perl/pthreads_hotfix.patch b/perl/perl/pthreads_hotfix.patch deleted file mode 100644 index 675277649..000000000 --- a/perl/perl/pthreads_hotfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../perl/pthreads_hotfix.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From efcebb94c92d3810f5500b035bb7454612a4204f Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Wed, 23 Apr 2014 09:02:25 +0200 -Subject: [PATCH] It's -lpthread not -lpthreads - -Otherwise linking fails with missing pthread symbols when building with -with -Dusethreads ---- - cnf/configure_libs.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cnf/configure_libs.sh b/cnf/configure_libs.sh -index e970947..651c9d8 100644 ---- a/cnf/configure_libs.sh -+++ b/cnf/configure_libs.sh -@@ -53,7 +53,7 @@ if not hinted 'perllibs'; then - appendvar '_libs' "$i" ;; - -ldl) - test "$usedl" != 'undef' && appendvar '_libs' "$i" ;; -- -lpthreads) -+ -lpthread) - test "$usethreads" != 'undef' && appendvar '_libs' "$i" ;; - # For a static build, -lgdbm and friends are assumed to be in ext.libs - esac --- -1.9.3 - diff --git a/perl/perl/typo_hotfix.patch b/perl/perl/typo_hotfix.patch deleted file mode 100644 index bd02a8d8f..000000000 --- a/perl/perl/typo_hotfix.patch +++ /dev/null @@ -1,45 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../perl/typo_hotfix.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From bddecfb07990891aab7da507187980d9333ee0af Mon Sep 17 00:00:00 2001 -From: Alex Suykov -Date: Wed, 23 Apr 2014 10:10:34 +0300 -Subject: [PATCH] typo - ---- - cnf/configure_libs.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cnf/configure_libs.sh b/cnf/configure_libs.sh -index f45d31c..e970947 100644 ---- a/cnf/configure_libs.sh -+++ b/cnf/configure_libs.sh -@@ -43,9 +43,9 @@ if not hinted 'perllibs'; then - # should be linked with. - # The whole idea is wrong, wrong, wrong, but it's tied to MakeMaker. - # Unlike Configure, we're picking libs presumably needed for perl -- # (Configure uses all except for those it know are not needed) -- # This allows adding anything to $libswanted without introducing unnecessary perl -- # dependencies. When perl itself needs something unusual, $perllibs value should be hinted. -+ # (Configure uses all except for those it knows are not needed) -+ # This allows adding anything to $libswanted without introducing unnecessary perl dependencies. -+ # When perl itself needs something unusual, $perllibs value should be hinted. - _libs='' - for i in $libs; do - case "$i" in --- -1.9.3 -