summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2016-08-11 16:49:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:27:06 +0100
commit6db9299d9eb814b410b0ac210245a463f1b718da (patch)
tree5ad562145b7a80e2ed70fadf60f1a0beb4d9144f /meta/recipes-devtools
parent2561b58ac8131325c3e0248ad4a6533b1dd1b032 (diff)
downloadpoky-6db9299d9eb814b410b0ac210245a463f1b718da.tar.gz
perl-native: backport libnm link fix
pre-5.25.0 perl by default tries to link to an antiquated libnm (new math) which is not used anymore since the early 1990's. After 2014 another libnm appeared for NetworkManager causing build failures. (From OE-Core rev: 97d2ba227044571408151f84cfe611e1a72dd816) (From OE-Core rev: 60e0374240c2121485dc91892a693cd6ac2eae24) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.22.1.bb1
-rw-r--r--meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.1.bb b/meta/recipes-devtools/perl/perl-native_5.22.1.bb
index ed8222f24c..1c21522be1 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.1.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.1.bb
@@ -11,6 +11,7 @@ SRC_URI += "\
11 file://debian/errno_ver.diff \ 11 file://debian/errno_ver.diff \
12 file://dynaloaderhack.patch \ 12 file://dynaloaderhack.patch \
13 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ 13 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
14 file://perl-remove-nm-from-libswanted.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "6671e4829cbaf9cecafa9a84f141b0a3" 17SRC_URI[md5sum] = "6671e4829cbaf9cecafa9a84f141b0a3"
diff --git a/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch b/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch
new file mode 100644
index 0000000000..c489f05bfe
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-remove-nm-from-libswanted.patch
@@ -0,0 +1,30 @@
1From 4732711e2548b6d734ca831d65dbcf501a89774e Mon Sep 17 00:00:00 2001
2From: Andreas Koenig <andk@cpan.org>
3Date: Sun, 3 Jan 2016 08:40:33 +0100
4Subject: [PATCH] Remove nm from libswanted
5
6Nm stood for "New Math" library in the context of 1994. 2014 a conflicting
7library libnm appeared that has a network manager context.
8
9Upstream-Status: Backport [commit 4732711e on branch blead, tag v5.25.0]
10
11---
12 Configure | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Configure b/Configure
16index 0e71b4b..cfbdaa1 100755
17--- a/Configure
18+++ b/Configure
19@@ -1464,7 +1464,7 @@ libswanted_uselargefiles=''
20 : set usesocks on the Configure command line to enable socks.
21 : List of libraries we want.
22 : If anyone needs extra -lxxx, put those in a hint file.
23-libswanted="cl pthread socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld"
24+libswanted="cl pthread socket bind inet nsl ndbm gdbm dbm db malloc dl ld"
25 libswanted="$libswanted sun m crypt sec util c cposix posix ucb bsd BSD"
26 : We probably want to search /usr/shlib before most other libraries.
27 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
28--
292.9.2
30