From: Imre Kaloz Date: Fri, 5 Jan 2007 19:47:31 +0000 (+0000) Subject: fix kernel compile on real operating systems :P (closes #1150) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d82a8a3da0b9afbb526facad3f72ffb72aad1e83;p=openwrt%2Fstaging%2Fnbd.git fix kernel compile on real operating systems :P (closes #1150) SVN-Revision: 5997 --- diff --git a/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch index 962247ca44..f5f187e9b7 100644 --- a/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch +++ b/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch @@ -26,12 +26,13 @@ diff -urN linux-2.6.19.1/scripts/mod/file2alias.c linux-2.6.19.1.new/scripts/mod diff -urN linux-2.6.19.1/scripts/mod/mk_elfconfig.c linux-2.6.19.1.new/scripts/mod/mk_elfconfig.c --- linux-2.6.19.1/scripts/mod/mk_elfconfig.c 2006-12-11 20:32:53.000000000 +0100 +++ linux-2.6.19.1.new/scripts/mod/mk_elfconfig.c 2007-01-02 15:43:57.000000000 +0100 -@@ -1,7 +1,9 @@ +@@ -1,7 +1,11 @@ #include #include #include --#include -+#ifdef __APPLE__ ++#ifndef __APPLE__ + #include ++#else +#include "../../../../../tools/sstrip/include/elf.h" +#endif @@ -40,12 +41,13 @@ diff -urN linux-2.6.19.1/scripts/mod/mk_elfconfig.c linux-2.6.19.1.new/scripts/m diff -urN linux-2.6.19.1/scripts/mod/modpost.h linux-2.6.19.1.new/scripts/mod/modpost.h --- linux-2.6.19.1/scripts/mod/modpost.h 2006-12-11 20:32:53.000000000 +0100 +++ linux-2.6.19.1.new/scripts/mod/modpost.h 2007-01-02 15:40:55.000000000 +0100 -@@ -7,7 +7,9 @@ +@@ -7,7 +7,11 @@ #include #include #include --#include -+#ifdef __APPLE__ ++#ifndef __APPLE__ + #include ++#else +#include "../../../../../tools/sstrip/include/elf.h" +#endif @@ -67,12 +69,10 @@ diff -urN linux-2.6.19.1/scripts/mod/sumversion.c linux-2.6.19.1.new/scripts/mod diff -urN linux-2.6.19.1/scripts/kconfig linux-2.6.19.1.new/scripts/kconfig/Makefile --- linux-2.6.19.1/scripts/kconfig/Makefile 2007-01-04 17:49:35.000000000 +0100 +++ linux-2.6.19.1.new/scripts/kconfig/Makefile 2007-01-04 17:50:37.000000000 +0100 -@@ -86,7 +86,10 @@ - # Use reursively expanded variables so we do not call gcc unless +@@ -87,6 +87,9 @@ # we really need to do so. (Do not call gcc as part of make mrproper) HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) --HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -+HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -lncurses + HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) +ifeq ($(shell uname -s),Darwin) +HOST_LOADLIBES += -lncurses +endif