Fix batman compilation by using EXTRA_CFLAGS and not overriding CFLAGS
authorFlorian Fainelli <florian@openwrt.org>
Sun, 2 Mar 2008 17:21:15 +0000 (17:21 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sun, 2 Mar 2008 17:21:15 +0000 (17:21 +0000)
SVN-Revision: 10541

net/batman/Makefile
net/batman/patches/001-extra_cflags.patch [new file with mode: 0644]

index e25d0db..ec4254c 100644 (file)
@@ -58,7 +58,7 @@ Kernel gateway module for B.A.T.M.A.N.
 endef
 
 MAKE_ARGS += \
-       CFLAGS="$(TARGET_CFLAGS)" \
+       EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
        CCFLAGS="$(TARGET_CFLAGS)" \
        OFLAGS="$(TARGET_CFLAGS)" \
        REVISION="$(PKG_REV)" \
diff --git a/net/batman/patches/001-extra_cflags.patch b/net/batman/patches/001-extra_cflags.patch
new file mode 100644 (file)
index 0000000..ac6384f
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN batmand-r963/linux/modules/Makefile.kbuild batmand-r963.new/linux/modules/Makefile.kbuild
+--- batmand-r963/linux/modules/Makefile.kbuild 2008-01-28 08:47:35.000000000 +0100
++++ batmand-r963.new/linux/modules/Makefile.kbuild     2008-03-02 18:24:49.000000000 +0100
+@@ -3,7 +3,7 @@
+ endif
+ LINUX26:=2.6
+-CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\"
++EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\"
+ ifeq ($(strip $(findstring $(LINUX26),$(LINUX_VERSION))),$(LINUX26))