Source: tinyxml
Version: 2.6.2-3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
tinyxml fails to cross build from source, because it uses build
architecture tools. After switching to triplet-prefixed tools, it still
fails running the test suite under DEB_BUILD_OPTIONS=nocheck. After
applying the attached patch, tinyxml cross builds just fine. Please
consider applying it.
Helmut
diff --minimal -Nru tinyxml-2.6.2/debian/changelog
tinyxml-2.6.2/debian/changelog
--- tinyxml-2.6.2/debian/changelog 2015-08-04 22:23:51.000000000 +0200
+++ tinyxml-2.6.2/debian/changelog 2016-10-01 13:30:07.000000000 +0200
@@ -1,3 +1,12 @@
+tinyxml (2.6.2-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Use triplet-prefixed tools
+ + Support DEB_BUILD_OPTIONS=nocheck
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 01 Oct 2016 13:30:03 +0200
+
tinyxml (2.6.2-3) unstable; urgency=medium
* Rename libtinyxml2.6.2 to libtinyxml2.6.2v5 for the libstdc++6 transition.
diff --minimal -Nru tinyxml-2.6.2/debian/rules tinyxml-2.6.2/debian/rules
--- tinyxml-2.6.2/debian/rules 2015-08-02 18:39:55.000000000 +0200
+++ tinyxml-2.6.2/debian/rules 2016-10-01 13:35:57.000000000 +0200
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
include /usr/share/dpkg/default.mk
+ifeq ($(origin CXX),default)
+CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
CXXFLAGS += -DTIXML_USE_STL
@@ -10,12 +13,12 @@
dh $@ --parallel
override_dh_auto_build:
- dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
- ar rc libtinyxml.a $(OBJ_FILES)
+ dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)"
LDFLAGS="$(LDFLAGS)" CXX="$(CXX)" LD="$(CXX)"
+ $(DEB_HOST_GNU_TYPE)-ar rc libtinyxml.a $(OBJ_FILES)
rm *.o xmltest
- dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -fPIC"
LDFLAGS="$(LDFLAGS)"
- g++ -shared -Wl,-soname,libtinyxml.so.$(DEB_VERSION_UPSTREAM) \
+ dh_auto_build -- CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -fPIC"
LDFLAGS="$(LDFLAGS)" CXX="$(CXX)" LD="$(CXX)"
+ $(CXX) -shared -Wl,-soname,libtinyxml.so.$(DEB_VERSION_UPSTREAM) \
-o libtinyxml.so.$(DEB_VERSION_UPSTREAM) $(LDFLAGS) \
$(OBJ_FILES)
@@ -29,11 +32,13 @@
sed -e 's/\$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/' -e
's/\$${DEB_VERSION_UPSTREAM}/$(DEB_VERSION_UPSTREAM)/' \
debian/tinyxml.pc.in >
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tinyxml.pc
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
override_dh_auto_test:
mkdir xmltestdir
cp -a utf8test*.xml xmltestdir
cd xmltestdir && ../xmltest
rm -rf xmltestdir
+endif
override_dh_auto_clean:
dh_auto_clean
