From: Sven Hoexter Date: Mon, 21 May 2012 18:24:34 +0000 (+0200) Subject: Add debian/patches/honor-cppflags - scons should use exported CPPFLAGS. X-Git-Tag: debian/0.9.7-2~5 X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=f2245492383ffcdf4412de9a2306328f39c94e92;p=sven%2Fexfat-utils.git Add debian/patches/honor-cppflags - scons should use exported CPPFLAGS. --- diff --git a/debian/changelog b/debian/changelog index 4d0f0a9..47bc2ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ exfat-utils (0.9.7-2) UNRELEASED; urgency=low * Enable all hardening flags via DEB_BUILD_MAINT_OPTIONS. * Export CFLAGS as CCFLAGS which is honored by the current SConstruct file. + * Add debian/patches/honor-cppflags - scons should use exported + CPPFLAGS. -- Sven Hoexter Thu, 17 May 2012 13:50:03 +0200 diff --git a/debian/patches/honor-cppflags b/debian/patches/honor-cppflags new file mode 100644 index 0000000..199876b --- /dev/null +++ b/debian/patches/honor-cppflags @@ -0,0 +1,13 @@ +Applied upstream in r284. +http://code.google.com/p/exfat/source/detail?r=284 +--- a/SConstruct ++++ b/SConstruct +@@ -41,6 +41,8 @@ if not conf.env['CCFLAGS']: + conf.env.Replace(CCFLAGS = '-Wall -O2 -ggdb') + elif conf.env['CC'] == 'clang': + conf.env.Replace(CCFLAGS = '-Wall -O2 -g') ++if 'CPPFLAGS' in os.environ: ++ conf.env.Replace(CPPFLAGS = os.environ['CPPFLAGS']) + conf.env.Append(CPPDEFINES = {'FUSE_USE_VERSION': 26}) + conf.env.Append(CPPDEFINES = {'_FILE_OFFSET_BITS' : 64}) + conf.env.Append(CPPPATH = ['libexfat']) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..06c25e1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +honor-cppflags