[mingw-xerces-c: 9/13] Fix FTBFS against gcc 4.6

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 18:20:46 UTC 2012


commit 7dc0987ab98f9c4405336da693481ced6cd894b6
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Feb 27 20:58:52 2012 +0100

    Fix FTBFS against gcc 4.6
    
    Replaced the LDFLAGS override by a patch as it's needed to be compatible with GCC 4.6

 mingw32-xerces-c.spec                          |    8 ++++++--
 xerces-c-3.0.1-fix-libtool-compatibility.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-xerces-c.spec b/mingw32-xerces-c.spec
index 246bbc4..c539ac6 100644
--- a/mingw32-xerces-c.spec
+++ b/mingw32-xerces-c.spec
@@ -14,6 +14,7 @@ Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://xml.apache.org/xerces-c/
 Source0:        http://www.apache.org/dist/xerces/c/3/sources/xerces-c-%{version}.tar.gz
+Patch0:         xerces-c-3.0.1-fix-libtool-compatibility.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,15 +35,16 @@ faithful to the XML 1.0 recommendation and associated standards (DOM
 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).
 
 
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
 
 
 %prep
 %setup -q -n xerces-c-%{version}
+%patch0 -p0 -b .libtool
 
 
 %build
-%{_mingw32_configure} LDFLAGS=-no-undefined \
+%{_mingw32_configure} \
     --disable-static \
     --disable-pretty-make
 make %{?_smp_mflags}
@@ -72,6 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.1.1-3
 - Rebuild against the mingw-w64 toolchain
+- Replaced the LDFLAGS override by a patch as it's needed
+  to be compatible with GCC 4.6
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/xerces-c-3.0.1-fix-libtool-compatibility.patch b/xerces-c-3.0.1-fix-libtool-compatibility.patch
new file mode 100644
index 0000000..9fd2691
--- /dev/null
+++ b/xerces-c-3.0.1-fix-libtool-compatibility.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.am.orig	2011-01-26 20:13:09.904706354 +0100
++++ src/Makefile.am	2011-01-26 20:13:18.970166077 +0100
+@@ -33,7 +33,7 @@
+ #
+ AM_CPPFLAGS =
+ 
+-libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D}
++libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D} -no-undefined
+ 
+ # This sets {install}/include as target for the headers
+ libxerces_c_ladir = ${includedir}
+--- src/Makefile.in.orig	2011-01-26 20:25:33.012440548 +0100
++++ src/Makefile.in	2011-01-26 20:26:33.886535098 +0100
+@@ -1415,7 +1415,7 @@
+ # make pretty-printing won't work.
+ #
+ AM_CPPFLAGS = $(am__append_3) $(am__append_12) $(am__append_25)
+-libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D}
++libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D} -no-undefined
+ 
+ # This sets {install}/include as target for the headers
+ libxerces_c_ladir = ${includedir}


More information about the scm-commits mailing list