From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 31 Oct 2012 00:24:00 +0000 (+0000)
Subject: eglibc: add a fake libintl.h for cross-rpcgen and cross-zic to fix build on mac os x
X-Git-Tag: reboot~12438
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7efe435f49098d2f476c4e807b22f8aecd7514ac;p=openwrt%2Fstaging%2Fjogo.git

eglibc: add a fake libintl.h for cross-rpcgen and cross-zic to fix build on mac os x

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 34026
---

diff --git a/toolchain/eglibc/common.mk b/toolchain/eglibc/common.mk
index c34c612402..30de8b129f 100644
--- a/toolchain/eglibc/common.mk
+++ b/toolchain/eglibc/common.mk
@@ -60,6 +60,7 @@ EGLIBC_CONFIGURE:= \
 
 export libc_cv_ssp=no
 export ac_cv_header_cpuid_h=yes
+export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include
 
 define Host/SetToolchainInfo
 	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
diff --git a/toolchain/eglibc/include/libintl.h b/toolchain/eglibc/include/libintl.h
new file mode 100644
index 0000000000..69cb887a26
--- /dev/null
+++ b/toolchain/eglibc/include/libintl.h
@@ -0,0 +1,6 @@
+#ifndef __FAKE_LIBINTL_H
+#define __FAKE_LIBINTL_H
+
+#define _(X) (X)
+
+#endif
diff --git a/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch b/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch
new file mode 100644
index 0000000000..4c58fb4fb4
--- /dev/null
+++ b/toolchain/eglibc/patches/2.15/120-use_host_cflags.patch
@@ -0,0 +1,22 @@
+--- a/libc/sunrpc/Makefile
++++ b/libc/sunrpc/Makefile
+@@ -175,7 +175,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$
+ 	$(+link)
+ 
+ $(addprefix $(objpfx)cross-,$(rpcgen-objs)): $(objpfx)cross-%.o: %.c
+-	gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \
++	gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ $(HOST_CFLAGS) \
+ 		$(OUTPUT_OPTION) $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-rpcgen: $(addprefix $(objpfx)cross-,$(rpcgen-objs))
+--- a/libc/timezone/Makefile
++++ b/libc/timezone/Makefile
+@@ -182,7 +182,7 @@ $(objpfx)zic: $(addprefix $(objpfx), $(z
+ 
+ $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
+ 	gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
+-		-DCROSS_ZIC $(compile-mkdep-flags)
++		-DCROSS_ZIC $(HOST_CFLAGS) $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
+ 	gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@