This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository bloboats.
commit 2f54fe352714488bf3c56b26b868642c5ad21772 Author: Markus Koschany <[email protected]> Date: Wed Jul 5 10:25:03 2017 +0200 Fix FTCBFS. - Let dh_auto_build pass cross compilers. - Do not rebuild during make install (cross.patch). Thanks: Helmut Grohne for the report and patch. Closes: #864534 --- debian/patches/cross.patch | 33 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch new file mode 100644 index 0000000..6027fc8 --- /dev/null +++ b/debian/patches/cross.patch @@ -0,0 +1,33 @@ +From: Helmut Grohne <[email protected]> +Subject: reverse X and X-stamp targets + +By having X contain the rules and X-stamp depend on X, X is always run. Thus +the binary is relinked during make install. This is bad, because +dh_auto_install doesn't pass cross compilers to make install. + +Index: bloboats-1.0.2+dfsg/Makefile +=================================================================== +--- bloboats-1.0.2+dfsg.orig/Makefile ++++ bloboats-1.0.2+dfsg/Makefile +@@ -143,8 +143,8 @@ + all: config-stamp build-stamp + + #main: $(OBJ) +-build-stamp: build +-build: config-stamp $(OBJ) ++build: build-stamp ++build-stamp: config-stamp $(OBJ) + mkdir -p bin + $(CXX) $(LDFLAGS) $(OBJ) $(LIBS) $(CXXFLAGS) + touch build-stamp +@@ -155,8 +155,8 @@ + $(CXX) -o bin/$(BINARY) $(OBJ) $(ICON) $(LIBS) + #$(STRIP) bin/$(BINARY) + +-config-stamp: config +-config: ++config: config-stamp ++config-stamp: + echo "datadir $(DATADIR)" >bloboats.dirs + echo "privatedir $(PRIVATEDIR)" >>bloboats.dirs + chmod 644 bloboats.dirs diff --git a/debian/patches/series b/debian/patches/series index 4378357..b998c8a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 03-uint32.patch Hardening.patch gcc-6-FTBFS.patch +cross.patch diff --git a/debian/rules b/debian/rules index 4f51045..7ad806e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ override_dh_auto_build: - $(MAKE) DATADIR=/usr/share/games/bloboats + dh_auto_build -- DATADIR=/usr/share/games/bloboats override_dh_auto_install: $(MAKE) \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bloboats.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
