Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame^] | 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 | |