Author: alteholz Date: 2013-10-29 18:41:39 +0000 (Tue, 29 Oct 2013) New Revision: 15046
Added: trunk/packages/uc-echo/trunk/debian/patches/m64-flag.patch Modified: trunk/packages/uc-echo/trunk/debian/changelog trunk/packages/uc-echo/trunk/debian/control trunk/packages/uc-echo/trunk/debian/patches/include.patch trunk/packages/uc-echo/trunk/debian/patches/series trunk/packages/uc-echo/trunk/debian/rules Log: make it compile on more archs Modified: trunk/packages/uc-echo/trunk/debian/changelog =================================================================== --- trunk/packages/uc-echo/trunk/debian/changelog 2013-10-29 14:33:53 UTC (rev 15045) +++ trunk/packages/uc-echo/trunk/debian/changelog 2013-10-29 18:41:39 UTC (rev 15046) @@ -1,3 +1,10 @@ +uc-echo (1.12-2) unstable; urgency=low + + * debian/control: use g++-multilib only when available (Closes: #727657) + * add patch to compile on mips/mipsel + + -- Thorsten Alteholz <deb...@alteholz.de> Mon, 28 Oct 2013 19:00:07 +0100 + uc-echo (1.12-1) unstable; urgency=low * initial version (Closes: #704902) Modified: trunk/packages/uc-echo/trunk/debian/control =================================================================== --- trunk/packages/uc-echo/trunk/debian/control 2013-10-29 14:33:53 UTC (rev 15045) +++ trunk/packages/uc-echo/trunk/debian/control 2013-10-29 18:41:39 UTC (rev 15046) @@ -7,7 +7,7 @@ python-all-dev (>=2.6), python-scipy, python-numpy, - g++-multilib + g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390x sparc sparc64 x32] Standards-Version: 3.9.4 Homepage: http://uc-echo.sourceforge.net/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/uc-echo/trunk/ Modified: trunk/packages/uc-echo/trunk/debian/patches/include.patch =================================================================== --- trunk/packages/uc-echo/trunk/debian/patches/include.patch 2013-10-29 14:33:53 UTC (rev 15045) +++ trunk/packages/uc-echo/trunk/debian/patches/include.patch 2013-10-29 18:41:39 UTC (rev 15046) @@ -2,8 +2,8 @@ Description: add #include <unistd.h> for definition of open() Index: echo_v1_12/MMAP.hpp =================================================================== ---- echo_v1_12.orig/MMAP.hpp 2013-04-02 17:40:01.000000000 +0200 -+++ echo_v1_12/MMAP.hpp 2013-04-02 17:40:01.000000000 +0200 +--- echo_v1_12.orig/MMAP.hpp 2013-10-28 11:44:22.000000000 +0100 ++++ echo_v1_12/MMAP.hpp 2013-10-28 11:44:22.000000000 +0100 @@ -6,6 +6,7 @@ #include <sys/stat.h> #include <fcntl.h> Added: trunk/packages/uc-echo/trunk/debian/patches/m64-flag.patch =================================================================== --- trunk/packages/uc-echo/trunk/debian/patches/m64-flag.patch (rev 0) +++ trunk/packages/uc-echo/trunk/debian/patches/m64-flag.patch 2013-10-29 18:41:39 UTC (rev 15046) @@ -0,0 +1,17 @@ +Author: Thorsten Alteholz <deb...@alteholz.de> +Description: don't use -m64 on all architectures +Index: echo_v1_12/Makefile +=================================================================== +--- echo_v1_12.orig/Makefile 2013-10-28 11:44:22.000000000 +0100 ++++ echo_v1_12/Makefile 2013-10-28 11:45:58.000000000 +0100 +@@ -1,5 +1,9 @@ + CXX = g++ +-CXXFLAGS += -Wall -O3 -m64 $(CLFAGS) $(CPPFLAGS) ++# ++# the flag -m64 has been removed here ++# it will be applied by debian/ruls as it is not available ++# on certain architectures like mips ++CXXFLAGS += -Wall -O3 $(CLFAGS) $(CPPFLAGS) + HEADERS = *.hpp + LIB = DNASeq.o NeighborSet.o KmerHashMap.o + TARGETS = hashing NeighborJoin NeighborJoinParam NeighborMerge Voting HashMerge Modified: trunk/packages/uc-echo/trunk/debian/patches/series =================================================================== --- trunk/packages/uc-echo/trunk/debian/patches/series 2013-10-29 14:33:53 UTC (rev 15045) +++ trunk/packages/uc-echo/trunk/debian/patches/series 2013-10-29 18:41:39 UTC (rev 15046) @@ -1,2 +1,3 @@ hardening-flags.patch include.patch +m64-flag.patch Modified: trunk/packages/uc-echo/trunk/debian/rules =================================================================== --- trunk/packages/uc-echo/trunk/debian/rules 2013-10-29 14:33:53 UTC (rev 15045) +++ trunk/packages/uc-echo/trunk/debian/rules 2013-10-29 18:41:39 UTC (rev 15046) @@ -2,13 +2,28 @@ # DH_VERBOSE := 1 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) LIBRARY_PATH=/usr/lib/$(gcc -print-multiarch) CPATH=/usr/include/$(gcc -print-multiarch) export LIBRARY_PATH CPATH +ADDCXXFLAGS = -m64 +ifeq ($(DEB_HOST_ARCH),mips) +ADDCXXFLAGS = +endif +ifeq ($(DEB_HOST_ARCH),mipsel) +ADDCXXFLAGS = +endif +CXXFLAGS += $(ADDCXXFLAGS) %: dh $@ --with python2 +override_dh_auto_build: + echo "I: DEB_HOST_ARCH: $(DEB_HOST_ARCH)" + echo "I: ADDCXXFLAGS: $(ADDCXXFLAGS)" + echo "I: CXXFLAGS: $(CXXFLAGS)" + dh_auto_build + override_dh_auto_install: dh_auto_install dh_installchangelogs README _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
