This is an automated email from the git hooks/post-receive script. afif-guest pushed a commit to branch master in repository kmer-tools.
commit cc71a88d24555cb106daf70b2885d4148454fe41 Author: Afif Elghraoui <[email protected]> Date: Sat Jan 2 16:34:57 2016 -0800 Make the build system more flexible Don't name the build directory after the output of uname. This causes issues on GNU/kFreeBSD, which is not expected by the build system. --- debian/patches/allow-freebsd-build.patch | 121 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 +- 3 files changed, 123 insertions(+), 2 deletions(-) diff --git a/debian/patches/allow-freebsd-build.patch b/debian/patches/allow-freebsd-build.patch new file mode 100644 index 0000000..7151e10 --- /dev/null +++ b/debian/patches/allow-freebsd-build.patch @@ -0,0 +1,121 @@ +Description: Try to fix building on kFreeBSD + Upstream's build system fails to detect GNU/kFreeBSD because its + uname output is unique. This patch sets its uname to match the + regular FreeBSD build parameters. It also sets the target build + directory to always be "installdir" (rather than uname-arch). We + only build for one architecture at a time, anyway, and this way, + we don't have to figure out which system we're building on + and mangle the uname string depending on whether we're Linux or kFreeBSD. +Author: Afif Elghraoui <[email protected]> +Forwarded: not-needed +Last-Update: 2016-01-02 +--- kmer-tools.orig/configure.sh ++++ kmer-tools/configure.sh +@@ -43,7 +43,7 @@ + target="Darwin-amd64$opts" + fi + ;; +- FreeBSD) ++ FreeBSD|"GNU/kFreeBSD") + target="FreeBSD-i386$opts" + if [ `uname -m` = "amd64" ] ; then + target="FreeBSD-amd64$opts" +@@ -137,7 +137,7 @@ + CXXLIBS := + LDFLAGS_PYTHON := -bundle -framework CoreFoundation -framework Python -dynamic + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Darwin-i386-debug|Darwin-amd64-debug) +@@ -157,7 +157,7 @@ + CXXLIBS := + LDFLAGS_PYTHON := -bundle -framework CoreFoundation -framework Python -dynamic + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + FreeBSD-amd64) +@@ -175,7 +175,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -lthr + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + FreeBSD-amd64-debug) +@@ -193,7 +193,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -lthr + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + FreeBSD-amd64-profile) +@@ -211,7 +211,7 @@ + CXXLDFLAGS := -pg -L/usr/local/lib + CXXLIBS := -pthread -lthr + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Linux-i686) +@@ -229,7 +229,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -ldl + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Linux-amd64) +@@ -247,7 +247,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -ldl + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Linux-amd64-debug) +@@ -265,7 +265,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -ldl + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Linux-amd64-profile) +@@ -283,7 +283,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -ldl + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + Linux-ia64) +@@ -301,7 +301,7 @@ + CXXLDFLAGS := -L/usr/local/lib + CXXLIBS := -pthread -ldl + ARFLAGS := ruvs +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + +@@ -331,7 +331,7 @@ + CXXLDFLAGS := + CXXLIBS := -lpthread -lrt + ARFLAGS := ruv +-INSTALL/ := $target/ ++INSTALL/ := installdir/ + EOF + ;; + *) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..afabe74 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +allow-freebsd-build.patch diff --git a/debian/rules b/debian/rules index d168a9d..929fdfa 100755 --- a/debian/rules +++ b/debian/rules @@ -25,11 +25,10 @@ override_dh_auto_build: CLDFLAGS="$(LDFLAGS)" \ CXXLDFLAGS="$(LDFLAGS)" # WITHOUT="$(unusable)" - ln -sf $(shell uname)-* installdir override_dh_auto_clean: $(MAKE) real-clean - rm -rf $(shell uname)-* installdir + rm -rf installdir get-orig-source: DEB_VERSION_UPSTREAM=$(DEB_VERSION_UPSTREAM) debian/get-orig-source -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/kmer-tools.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
