From patchwork Mon Dec 10 17:06:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 205021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3F77C2C0100 for ; Tue, 11 Dec 2012 06:56:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 74D7FA012E; Mon, 10 Dec 2012 19:56:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z7QCr+sm1suI; Mon, 10 Dec 2012 19:56:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 95D0CA00FB; Mon, 10 Dec 2012 19:56:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B81418F74B for ; Mon, 10 Dec 2012 19:56:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3728581928 for ; Mon, 10 Dec 2012 19:56:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IqWOjt4XBauU for ; Mon, 10 Dec 2012 19:56:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id A3E1682004 for ; Mon, 10 Dec 2012 19:56:04 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1Ti9SF-0003sN-FR; Mon, 10 Dec 2012 20:56:01 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1Ti6ol-0002px-V4; Mon, 10 Dec 2012 18:07:00 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Mon, 10 Dec 2012 18:06:59 +0100 Message-Id: <1355159219-10867-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] linux-fusion: don't override CFLAGS/LDFLAGS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Putting $(TARGET_CONFIGURE_OPTS) after $(MAKE) overrides the Makefile's CFLAGS and LDFLAGS. Some of these flags are required, however. So instead pass these things in the environment, which allows the Makefile to append to the flags. This removes the need for the patch, because now the correct -I options are added. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Samuel Martin --- Build-test only .../linux-fusion/linux-fusion-fix-include.patch | 52 -------------------- package/linux-fusion/linux-fusion.mk | 6 +-- 2 files changed, 3 insertions(+), 55 deletions(-) diff --git a/package/linux-fusion/linux-fusion-fix-include.patch b/package/linux-fusion/linux-fusion-fix-include.patch deleted file mode 100644 index fe91488..0000000 --- a/package/linux-fusion/linux-fusion-fix-include.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix directfb-fusion kernel module build. - -This patch avoids the following error occurs: - -/usr/bin/make -f scripts/Makefile.build obj=/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion /opt/br/output/host/usr/bin/ccache - /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wp,-MD,/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/.fusioncore_impl.o.d - -nostdinc -isystem /opt/br/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/include -I/opt/br/output/build/linux-3.6/arch/arm/include - -Iarch/arm/include/generated -Iinclude -include /opt/br/output/build/linux-3.6/include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Iarch/arm/mach-versatile/include - -Iarch/arm/plat-versatile/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/br/output/build/linux-fusion-8.8.1/linux/include -Wall -Wundef - -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -O2 -marm - -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -funwind-tables -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm9tdmi -msoft-float -Uarm -Wframe-larger-than=1024 - -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -DMODULE - -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(fusioncore_impl)" -D"KBUILD_MODNAME=KBUILD_STR(fusion)" -c -o -/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o /opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c -/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c:25:19: fatal error: debug.h: No such file or directory -compilation terminated. -make[3]: *** [/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o] Error 1 -make[2]: *** [_module_/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion] Error 2 -make[2]: Leaving directory `/opt/br/output/build/linux-3.6' -make[1]: *** [modules] Error 2 -make[1]: Leaving directory `/opt/br/output/build/linux-fusion-8.8.1' - - -Signed-off-by: Samuel Martin - -diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h ---- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h 2012-10-15 21:47:53.881834496 +0200 -+++ linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h 2012-10-15 22:05:27.232401023 +0200 -@@ -17,7 +17,7 @@ - - #include - --#include "fusioncore_impl.h" -+#include "single/fusioncore_impl.h" - - typedef enum { - FC_OK, -diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c ---- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c 2012-10-15 21:47:53.878501243 +0200 -+++ linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c 2012-10-15 22:05:38.585511304 +0200 -@@ -22,9 +22,9 @@ - #include - #include - --#include "debug.h" -+#include "../debug.h" - --#include "fusioncore.h" -+#include "../fusioncore.h" - - - diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 631f526..5ea7900 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -22,15 +22,15 @@ LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS) LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)/kernel define LINUX_FUSION_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LINUX_FUSION_MAKE_OPTS) -C $(@D) endef define LINUX_FUSION_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install endef define LINUX_FUSION_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) \ $(LINUX_FUSION_MAKE_OPTS) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ -C $(@D) install