diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-02-10 16:04:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-29 16:50:53 +0100 |
commit | 2c638f46ba3dd426c53fe2acc10197409db2c3bc (patch) | |
tree | ca5517abfef137aa7ed1a746640d5aa8808d11ab /meta | |
parent | f85376290f768a69f6764428da7d9795009fee95 (diff) | |
download | poky-2c638f46ba3dd426c53fe2acc10197409db2c3bc.tar.gz |
libxslt: Add build fix (with ld-is-gold)
Libraries must be linked with "-lm", otherwise gold fails to link
binaries with those libraries.
(From OE-Core rev: 9175164380b50852a21a05d4e81294394c5486f4)
(From OE-Core rev: 3bd47a7db76cead77d0aa2b3b29f8513469dbe60)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.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')
-rw-r--r-- | meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch | 48 | ||||
-rw-r--r-- | meta/recipes-support/libxslt/libxslt_1.1.29.bb | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch b/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch new file mode 100644 index 0000000000..16ffeba106 --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt/0001-Link-libraries-with-libm.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 487e2f7e35dad3deec7978ce4478a3d4ea5070e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 10 Feb 2017 14:26:59 +0200 | ||
4 | Subject: [PATCH] Link libraries with libm | ||
5 | |||
6 | Otherwise linking the resulting libraries to a binary (e.g. xsltproc) | ||
7 | fails when using gold linker: | ||
8 | | ../libxslt/.libs/libxslt.so: error: undefined reference to 'fmod' | ||
9 | | ../libxslt/.libs/libxslt.so: error: undefined reference to 'pow' | ||
10 | | ../libexslt/.libs/libexslt.so: error: undefined reference to 'floor' | ||
11 | | collect2: error: ld returned 1 exit status | ||
12 | |||
13 | Upstream-Status: Submitted [mailing list, Feb 10 2017] | ||
14 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
15 | --- | ||
16 | libexslt/Makefile.am | 2 +- | ||
17 | libxslt/Makefile.am | 2 +- | ||
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am | ||
21 | index 1cf5138..5449524 100644 | ||
22 | --- a/libexslt/Makefile.am | ||
23 | +++ b/libexslt/Makefile.am | ||
24 | @@ -27,7 +27,7 @@ libexslt_la_SOURCES = \ | ||
25 | libexslt.h \ | ||
26 | dynamic.c | ||
27 | |||
28 | -libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) | ||
29 | +libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS) | ||
30 | libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) | ||
31 | |||
32 | man_MANS = libexslt.3 | ||
33 | diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am | ||
34 | index d9fed68..9d44c3d 100644 | ||
35 | --- a/libxslt/Makefile.am | ||
36 | +++ b/libxslt/Makefile.am | ||
37 | @@ -62,7 +62,7 @@ else | ||
38 | LIBXSLT_VERSION_SCRIPT = | ||
39 | endif | ||
40 | |||
41 | -libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) | ||
42 | +libxslt_la_LIBADD = $(LIBXML_LIBS) $(M_LIBS) $(EXTRA_LIBS) | ||
43 | libxslt_la_LDFLAGS = \ | ||
44 | $(WIN32_EXTRA_LDFLAGS) \ | ||
45 | $(LIBXSLT_VERSION_SCRIPT) \ | ||
46 | -- | ||
47 | 2.1.4 | ||
48 | |||
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.29.bb b/meta/recipes-support/libxslt/libxslt_1.1.29.bb index be747e608d..2946a745e9 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.29.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.29.bb | |||
@@ -11,6 +11,7 @@ DEPENDS = "libxml2" | |||
11 | SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \ | 11 | SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \ |
12 | file://pkgconfig_fix.patch \ | 12 | file://pkgconfig_fix.patch \ |
13 | file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \ | 13 | file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \ |
14 | file://0001-Link-libraries-with-libm.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e" | 17 | SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e" |