[SCM] Package for Analyzing Lattice Polytopes branch, master, updated. upstream/2.1-4-g8641cee

Julien Puydt julien.puydt at laposte.net
Wed Jun 20 11:25:03 UTC 2012


The following commit has been merged in the master branch:
commit 8641ceef447a590a0ff12cec9bdbf2011649e0f0
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Jun 20 13:19:49 2012 +0200

    Pass CFLAGS (and CPPFLAGS) to make instead of patching

diff --git a/debian/patches/dpkg-buildflags.patch b/debian/patches/dpkg-buildflags.patch
deleted file mode 100644
index e050ac9..0000000
--- a/debian/patches/dpkg-buildflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Julien Puydt <julien.puydt at laposte.net>
-Description: Make the compilation use dpkg-buildflags
-Forwarded: no
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 4cac75f..fa8f7ec 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -17,7 +17,8 @@ MORI_OBJ= $(MORI_SRC:.c=.o)
- 
- CC=gcc
- 
--CFLAGS=-O3 -g -W -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CFLAGS=`dpkg-buildflags --get CFLAGS`
-+#CFLAGS=-O3 -g -W -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # CFLAGS=-O3 -g				      # add -g for GNU debugger gdb
- # CFLAGS=-Ofast -O3 -mips4 -n32		      # SGI / 32 bit
- # CFLAGS=-Ofast -O3 -mips4 -64                # SGI / 64 bit
diff --git a/debian/patches/series b/debian/patches/series
index 94f69fa..ed3ffd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-format-errors.patch
-dpkg-buildflags.patch
diff --git a/debian/rules b/debian/rules
index ff96937..168b293 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
+CFLAGS=`dpkg-buildflags --get CFLAGS`
+CPPFLAGS=`dpkg-buildflags --get CPPFLAGS`
+
 %:
 	dh $@
 
+build:
+	make CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+
 override_dh_auto_clean:
 	rm -f *.o *.x

-- 
Package for Analyzing Lattice Polytopes



More information about the debian-science-commits mailing list