From a26719f388ba4233f1b499fa89f9d0c89d072ba1 Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Fri, 20 Jun 2014 17:30:32 +0200 Subject: [PATCH] perl: added two hotfix patches. a harmelss typo hotfix and a not so harmless one: https://github.com/arsv/perl-cross/commit/efcebb94c92d3810f5500b035bb7454612a4204f --- perl/perl/pthreads_hotfix.patch | 43 +++++++++++++++++++++++++++++++ perl/perl/typo_hotfix.patch | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 perl/perl/pthreads_hotfix.patch create mode 100644 perl/perl/typo_hotfix.patch diff --git a/perl/perl/pthreads_hotfix.patch b/perl/perl/pthreads_hotfix.patch new file mode 100644 index 000000000..675277649 --- /dev/null +++ b/perl/perl/pthreads_hotfix.patch @@ -0,0 +1,43 @@ +# --- 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 new file mode 100644 index 000000000..bd02a8d8f --- /dev/null +++ b/perl/perl/typo_hotfix.patch @@ -0,0 +1,45 @@ +# --- 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 +