Control: tag -1 patch

Adam D. Barratt <a...@adam-barratt.org.uk> (2013-10-30):
> goldencheetah FTFBS in sid (having been binNMUed against libvlccore7,
> although that appears to be unrelated).
> 
> From the amd64 build log:
> […]
> g++: error: /usr/lib/libkmldom.a: No such file or directory
> g++: error: /usr/lib/libkmlconvenience.a: No such file or directory
> g++: error: /usr/lib/libkmlengine.a: No such file or directory
> g++: error: /usr/lib/libkmlbase.a: No such file or directory

The attached patch is slightly ugly, but does the job. One could think
about saving the initial file and restoring it afterwards.

Mraw,
KiBi.
diff -Nru goldencheetah-3.0/debian/changelog goldencheetah-3.0/debian/changelog
--- goldencheetah-3.0/debian/changelog	2013-08-18 00:04:37.000000000 +0200
+++ goldencheetah-3.0/debian/changelog	2013-10-31 02:43:52.000000000 +0100
@@ -1,3 +1,13 @@
+goldencheetah (3.0-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS when static libraries are moved from /usr/lib/libfoo.a to
+    /usr/lib/<triplet>/libfoo.a: post-process src/src.pro after the
+    configuration step to replace the former if it doesn't exist with
+    the latter if it does exist. (Closes: #728351)
+
+ -- Cyril Brulebois <k...@debian.org>  Thu, 31 Oct 2013 02:38:58 +0100
+
 goldencheetah (3.0-3) unstable; urgency=low
 
   * debian/control: remove needless dependency. (Closes: #719571)
diff -Nru goldencheetah-3.0/debian/rules goldencheetah-3.0/debian/rules
--- goldencheetah-3.0/debian/rules	2013-07-31 02:08:45.000000000 +0200
+++ goldencheetah-3.0/debian/rules	2013-10-31 02:43:55.000000000 +0100
@@ -20,6 +20,16 @@
 	cp $(CURDIR)/debian/gcconfig.pri $(CURDIR)/src/
 	cp $(CURDIR)/debian/qwtconfig.pri $(CURDIR)/qwt/
 	dh_auto_configure
+	# Switch static libraries to multiarch paths where relevant (#728351):
+	for staticlib in $$(grep -o '/lib/[^/]\+\.a' src/src.pro); do \
+		libname=$$(echo $$staticlib|sed 's,.*/,,'); \
+		if [ ! -e /usr/lib/$$libname ]; then \
+			if [ -e /usr/lib/$(DEB_HOST_MULTIARCH)/$$libname ]; then \
+				echo "Switching to multiarch path for library: $$libname"; \
+				sed -i "s,$$staticlib,/lib/$(DEB_HOST_MULTIARCH)/$$libname," src/src.pro; \
+			fi; \
+		fi; \
+	done
 
 override_dh_auto_install:
 

Attachment: signature.asc
Description: Digital signature

Reply via email to