From db25b605c0ce40362dc0727a3b9fa69abbff6dd3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Apr 2011 12:01:23 +0000 Subject: [PATCH] Added more srpt/patches/kernel-*-pre-cflags.patch files (svn merge -c3371,3373,3374 https://scst.svn.sourceforge.net/svnroot/scst/trunk). git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@3375 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/patches/kernel-2.6.28-pre-cflags.patch | 11 +++++++++++ srpt/patches/kernel-2.6.29-pre-cflags.patch | 11 +++++++++++ srpt/patches/kernel-2.6.31-pre-cflags.patch | 11 +++++++++++ srpt/patches/kernel-2.6.32-pre-cflags.patch | 19 ++++++++----------- srpt/patches/kernel-2.6.33-pre-cflags.patch | 14 ++++++++++++++ srpt/patches/kernel-2.6.34-pre-cflags.patch | 14 ++++++++++++++ srpt/patches/kernel-2.6.35-pre-cflags.patch | 14 ++++++++++++++ srpt/patches/kernel-2.6.36-pre-cflags.patch | 14 ++++++++++++++ srpt/patches/kernel-2.6.37-pre-cflags.patch | 14 ++++++++++++++ srpt/patches/kernel-2.6.38-pre-cflags.patch | 14 ++++++++++++++ 10 files changed, 125 insertions(+), 11 deletions(-) create mode 100644 srpt/patches/kernel-2.6.28-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.29-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.31-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.33-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.34-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.35-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.36-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.37-pre-cflags.patch create mode 100644 srpt/patches/kernel-2.6.38-pre-cflags.patch diff --git a/srpt/patches/kernel-2.6.28-pre-cflags.patch b/srpt/patches/kernel-2.6.28-pre-cflags.patch new file mode 100644 index 000000000..1e5b34ac8 --- /dev/null +++ b/srpt/patches/kernel-2.6.28-pre-cflags.patch @@ -0,0 +1,11 @@ +--- linux-2.6.27/scripts/Makefile.lib 2009-05-10 19:02:42.000000000 +0200 ++++ linux-2.6.27/scripts/Makefile.lib 2009-05-05 19:34:57.000000000 +0200 +@@ -119,7 +119,7 @@ + __cpp_flags = $(call flags,_cpp_flags) + endif + +-c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \ ++c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(PRE_CFLAGS) $(KBUILD_CPPFLAGS) \ + $(__c_flags) $(modkern_cflags) \ + -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) + diff --git a/srpt/patches/kernel-2.6.29-pre-cflags.patch b/srpt/patches/kernel-2.6.29-pre-cflags.patch new file mode 100644 index 000000000..88cc5f82d --- /dev/null +++ b/srpt/patches/kernel-2.6.29-pre-cflags.patch @@ -0,0 +1,11 @@ +--- linux-2.6.30/Makefile 2009-10-31 13:49:29.000000000 +0100 ++++ linux-2.6.30/Makefile 2009-10-31 13:49:32.000000000 +0100 +@@ -342,7 +342,7 @@ AFLAGS_KERNEL = + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) -Iinclude \ + $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ + -I$(srctree)/arch/$(hdr-arch)/include \ + -include include/linux/autoconf.h diff --git a/srpt/patches/kernel-2.6.31-pre-cflags.patch b/srpt/patches/kernel-2.6.31-pre-cflags.patch new file mode 100644 index 000000000..88cc5f82d --- /dev/null +++ b/srpt/patches/kernel-2.6.31-pre-cflags.patch @@ -0,0 +1,11 @@ +--- linux-2.6.30/Makefile 2009-10-31 13:49:29.000000000 +0100 ++++ linux-2.6.30/Makefile 2009-10-31 13:49:32.000000000 +0100 +@@ -342,7 +342,7 @@ AFLAGS_KERNEL = + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) -Iinclude \ + $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ + -I$(srctree)/arch/$(hdr-arch)/include \ + -include include/linux/autoconf.h diff --git a/srpt/patches/kernel-2.6.32-pre-cflags.patch b/srpt/patches/kernel-2.6.32-pre-cflags.patch index 2c782c124..88cc5f82d 100644 --- a/srpt/patches/kernel-2.6.32-pre-cflags.patch +++ b/srpt/patches/kernel-2.6.32-pre-cflags.patch @@ -1,14 +1,11 @@ -diff --git a/Makefile b/Makefile -index 8392b64..f5991d9 100644 ---- a/Makefile -+++ b/Makefile -@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage +--- linux-2.6.30/Makefile 2009-10-31 13:49:29.000000000 +0100 ++++ linux-2.6.30/Makefile 2009-10-31 13:49:32.000000000 +0100 +@@ -342,7 +342,7 @@ AFLAGS_KERNEL = # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option --LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ -+LINUXINCLUDE := $(PRE_CFLAGS) \ -+ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ - $(if $(KBUILD_SRC), -I$(srctree)/include) \ - -include include/generated/autoconf.h - +-LINUXINCLUDE := -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) -Iinclude \ + $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ + -I$(srctree)/arch/$(hdr-arch)/include \ + -include include/linux/autoconf.h diff --git a/srpt/patches/kernel-2.6.33-pre-cflags.patch b/srpt/patches/kernel-2.6.33-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.33-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h + diff --git a/srpt/patches/kernel-2.6.34-pre-cflags.patch b/srpt/patches/kernel-2.6.34-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.34-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h + diff --git a/srpt/patches/kernel-2.6.35-pre-cflags.patch b/srpt/patches/kernel-2.6.35-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.35-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h + diff --git a/srpt/patches/kernel-2.6.36-pre-cflags.patch b/srpt/patches/kernel-2.6.36-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.36-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h + diff --git a/srpt/patches/kernel-2.6.37-pre-cflags.patch b/srpt/patches/kernel-2.6.37-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.37-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h + diff --git a/srpt/patches/kernel-2.6.38-pre-cflags.patch b/srpt/patches/kernel-2.6.38-pre-cflags.patch new file mode 100644 index 000000000..2c782c124 --- /dev/null +++ b/srpt/patches/kernel-2.6.38-pre-cflags.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 8392b64..f5991d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -349,7 +349,8 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage + + # Use LINUXINCLUDE when you must reference the include/ directory. + # Needed to be compatible with the O= option +-LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ ++LINUXINCLUDE := $(PRE_CFLAGS) \ ++ -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \ + $(if $(KBUILD_SRC), -I$(srctree)/include) \ + -include include/generated/autoconf.h +