diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-01-23 06:56:08 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-01-23 06:56:08 +0100 |
| commit | 39d6239543df5dff1707e14e129574ac393325af (patch) | |
| tree | 0e3d40b5084cecde866c6101b63418d0c22685d8 | |
| parent | 8a9e96db8de0678190154ef22588c6a01d31be72 (diff) | |
changes for gcc-6 compatibility
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 01b69e7..51e469c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xbase64 (3.1.2-7) unstable; urgency=low + + * debian/rules: + - some changes for gcc-6 compatibility + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 23 Jan 2016 06:32:37 +0100 + xbase64 (3.1.2-6) unstable; urgency=low * debian/rules: diff --git a/debian/rules b/debian/rules index 517a4c8..c52f106 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif +# +# Test for gcc-6 support +# +#export CC=gcc-6 +#export CXX=g++-6 + DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -confflags = --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-static $(shell dpkg-buildflags --export=cmdline) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +export CXXFLAGS+= -std=c++98 + +confflags = --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-static %: dh $@ --with autoreconf |