[abiword] Fix BZ 716005: FTBFS
Marc Maurer
uwog at fedoraproject.org
Tue Aug 2 21:21:26 UTC 2011
commit 9ff04a67d64caef35d825b8e60dd1dd9d48cd499
Author: J.M. Maurer <uwog at uwog.net>
Date: Tue Aug 2 23:21:12 2011 +0200
Fix BZ 716005: FTBFS
abiword-2.8.6-no-undefined.patch | 30 ++++++++++++++++++++++++++++++
abiword.spec | 7 +++++++
2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/abiword-2.8.6-no-undefined.patch b/abiword-2.8.6-no-undefined.patch
new file mode 100644
index 0000000..fe858aa
--- /dev/null
+++ b/abiword-2.8.6-no-undefined.patch
@@ -0,0 +1,30 @@
+diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
+--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:13:52.690011591 +0200
+@@ -44,7 +44,7 @@
+
+ libabiword_2_8_la_LDFLAGS = \
+ $(DEPS_LIBS) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic
+
+@@ -107,7 +107,7 @@
+
+ AbiWord_LDFLAGS = \
+ $(DEPS_LIBS) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic \
+ -headerpad_max_install_names
+@@ -129,7 +129,7 @@
+
+ abiword_LDFLAGS = \
+ $(platform_ldflags) \
+- --no-undefined \
++ -Wl,--no-undefined \
+ -avoid-version \
+ -export-dynamic
+
diff --git a/abiword.spec b/abiword.spec
index 1d222b0..e16ecb8 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -36,6 +36,7 @@ Patch101: abiword-2.6.4-draghandles.patch
Patch102: abiword-2.6.4-nohtmloptions.patch
%endif
Patch103: abiword-2.8.6-libwpd.patch
+Patch104: abiword-2.8.6-no-undefined.patch
BuildRequires: autoconf, libtool
BuildRequires: desktop-file-utils
@@ -92,6 +93,7 @@ Includes and definitions for developing with libabiword.
%patch102 -p1 -b .nohtmloptions
%endif
%patch103 -p0 -b .libwpd
+%patch104 -p1 -b .no-undefined
# patch abiword plugins
#%patch3 -p1 -b .boolean
@@ -103,6 +105,8 @@ Includes and definitions for developing with libabiword.
%build
# build libabiword and abiword
cd $RPM_BUILD_DIR/abiword-%{version}
+# we need to update the generated configuration files because of patch104
+autoreconf --force --install
%if %{olpc_build}
%configure --disable-static --enable-dynamic --disable-gnomevfs --disable-gucharmap --disable-printing --enable-plugins="loadbindings collab" --enable-collab-backend-sugar
%else
@@ -186,6 +190,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
%changelog
+* Tue Aug 02 2011 Marc Maurer <uwog at abisource.com> - 1:2.8.6-11
+- Fix BZ 716005: --no-undefined is a linker flag, not a g++ flag
+
* Tue Aug 02 2011 Marc Maurer <uwog at abisource.com> - 1:2.8.6-10
- Mixed up the microversion and the release
More information about the scm-commits
mailing list