[SCM] FreeCAD packaging branch, master, updated. debian/0.12.5284-dfsg-6-2-g898d9c4

Anton Gladky gladky.anton at gmail.com
Mon May 14 17:38:04 UTC 2012


The following commit has been merged in the master branch:
commit b420ea063898c36c4177e83707363947312cdbe8
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon May 14 19:32:02 2012 +0200

    Add -fpermissive to cpp, c-flags to fix FTBFS with gcc-4.7.

diff --git a/debian/rules b/debian/rules
index cdf2aed..0d999c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 #Set flags, as suggested by Bernhard R. Link 
 # http://lists.alioth.debian.org/pipermail/debian-science-maintainers/2011-June/008157.html
 
-CFLAGS := -Wall -DHAVE_SWIG=1 $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS := -Wall -DHAVE_SWIG=1 $(shell dpkg-buildflags --get CXXFLAGS)
+CFLAGS := -Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := -Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CXXFLAGS)
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := -lrt $(shell dpkg-buildflags --get LDFLAGS)
 

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list