From 7895cb65d6b3b89dd914d1108a8de37a72c70f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 10 Nov 2014 13:34:08 +0100 Subject: merge 2.3.1-2 into 2.3.4-1 --- debian/patches/scons-isystem.diff | 43 -------------------------------------- debian/patches/scons-isystem.patch | 43 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 debian/patches/scons-isystem.diff create mode 100644 debian/patches/scons-isystem.patch (limited to 'debian/patches') diff --git a/debian/patches/scons-isystem.diff b/debian/patches/scons-isystem.diff deleted file mode 100644 index d3b6b60..0000000 --- a/debian/patches/scons-isystem.diff +++ /dev/null @@ -1,43 +0,0 @@ -Description: add -isystem support to scons -Author: James McCoy -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760804 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761565 -Forwarded: https://bitbucket.org/scons/scons/pull-request/184/support-isystem-in-parseflags/diff -Last-Update: 2014-09-16 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/scons.1 -=================================================================== ---- trunk.orig/scons.1 2014-09-16 07:55:07.618419159 +0200 -+++ trunk/scons.1 2014-09-16 07:55:07.550416614 +0200 -@@ -8549,6 +8549,7 @@ - \-framework FRAMEWORKS - \-frameworkdir= FRAMEWORKPATH - \-include CCFLAGS -+\-isystem CPPFLAGS - \-isysroot CCFLAGS, LINKFLAGS - \-I CPPPATH - \-l LIBS -Index: trunk/engine/SCons/Environment.py -=================================================================== ---- trunk.orig/engine/SCons/Environment.py 2014-09-15 20:30:32.000000000 +0200 -+++ trunk/engine/SCons/Environment.py 2014-09-16 07:57:55.260656356 +0200 -@@ -719,6 +719,9 @@ - t = ('-isysroot', arg) - dict['CCFLAGS'].append(t) - dict['LINKFLAGS'].append(t) -+ elif append_next_arg_to == '-isystem': -+ t = ('-isystem', arg) -+ dict['CCFLAGS'].append(t) - elif append_next_arg_to == '-arch': - t = ('-arch', arg) - dict['CCFLAGS'].append(t) -@@ -791,7 +794,7 @@ - elif arg[0] == '+': - dict['CCFLAGS'].append(arg) - dict['LINKFLAGS'].append(arg) -- elif arg in ['-include', '-isysroot', '-arch']: -+ elif arg in ['-include', '-isysroot', '-isystem', '-arch']: - append_next_arg_to = arg - else: - dict['CCFLAGS'].append(arg) diff --git a/debian/patches/scons-isystem.patch b/debian/patches/scons-isystem.patch new file mode 100644 index 0000000..d3b6b60 --- /dev/null +++ b/debian/patches/scons-isystem.patch @@ -0,0 +1,43 @@ +Description: add -isystem support to scons +Author: James McCoy +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760804 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761565 +Forwarded: https://bitbucket.org/scons/scons/pull-request/184/support-isystem-in-parseflags/diff +Last-Update: 2014-09-16 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/scons.1 +=================================================================== +--- trunk.orig/scons.1 2014-09-16 07:55:07.618419159 +0200 ++++ trunk/scons.1 2014-09-16 07:55:07.550416614 +0200 +@@ -8549,6 +8549,7 @@ + \-framework FRAMEWORKS + \-frameworkdir= FRAMEWORKPATH + \-include CCFLAGS ++\-isystem CPPFLAGS + \-isysroot CCFLAGS, LINKFLAGS + \-I CPPPATH + \-l LIBS +Index: trunk/engine/SCons/Environment.py +=================================================================== +--- trunk.orig/engine/SCons/Environment.py 2014-09-15 20:30:32.000000000 +0200 ++++ trunk/engine/SCons/Environment.py 2014-09-16 07:57:55.260656356 +0200 +@@ -719,6 +719,9 @@ + t = ('-isysroot', arg) + dict['CCFLAGS'].append(t) + dict['LINKFLAGS'].append(t) ++ elif append_next_arg_to == '-isystem': ++ t = ('-isystem', arg) ++ dict['CCFLAGS'].append(t) + elif append_next_arg_to == '-arch': + t = ('-arch', arg) + dict['CCFLAGS'].append(t) +@@ -791,7 +794,7 @@ + elif arg[0] == '+': + dict['CCFLAGS'].append(arg) + dict['LINKFLAGS'].append(arg) +- elif arg in ['-include', '-isysroot', '-arch']: ++ elif arg in ['-include', '-isysroot', '-isystem', '-arch']: + append_next_arg_to = arg + else: + dict['CCFLAGS'].append(arg) diff --git a/debian/patches/series b/debian/patches/series index 2a5d014..b5afaea 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ manpage-spelling.patch java_ignore_nonexistent_files.patch remove_stale_files.patch parallel_build.patch -scons-isystem.diff +scons-isystem.patch -- cgit v1.2.3