Add debian/patches/honor-cppflags - scons should use exported CPPFLAGS.

diff --git a/debian/changelog b/debian/changelog
index 4d0f0a9c61e5f7dbd2a05471d7da36be13a502e3..47bc2edea89fa3fb533fe6d4ceb09e576104d138 100644 (file)
--- 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.
   * 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 <hoexter@debian.org>  Thu, 17 May 2012 13:50:03 +0200
 
 
  -- Sven Hoexter <hoexter@debian.org>  Thu, 17 May 2012 13:50:03 +0200
 

diff --git a/debian/patches/honor-cppflags b/debian/patches/honor-cppflags
new file mode 100644 (file)
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 (file)
index 0000000..06c25e1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+honor-cppflags