From 644b7f27696de6fbbba53019f08ac534fd5ad37b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 2 Aug 2010 00:59:38 +0200
Subject: fix compile of gcc package, host cppflags should be not target
 cppflags

---
 package/eglibc/Makefile                |  1 +
 package/gcc/Makefile                   |  4 ++--
 package/gcc/patches/gcc-cppflags.patch | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 package/gcc/patches/gcc-cppflags.patch

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 4b737e303..e70d9a790 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -89,6 +89,7 @@ eglibc-dev-install:
 	$(MAKE) -C $(WRKBUILD) \
 		install-headers install-bootstrap-headers=yes
 	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
+	@find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \;
 	# conflicts with libiconv
 	find $(IDIR_EGLIBC_DEV) -name iconv.h -exec rm {} \;
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 77e346308..b12f2a3ec 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -23,9 +23,10 @@ PKG_DEPENDS+=		glibc-dev
 PKG_BUILDDEP+=		glibc
 endif
 
-PKG_HOST_DEPENDS:=	!freebsd
 PKG_TARGET_DEPENDS:=	!ag241
 
+WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -43,7 +44,6 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--disable-__cxa_atexit \
 			--without-headers \
 			--libexecdir=/usr/lib \
-			--with-gnu-ld \
 			--disable-libssp \
 			--disable-nls \
 			--disable-sjlj-exceptions \
diff --git a/package/gcc/patches/gcc-cppflags.patch b/package/gcc/patches/gcc-cppflags.patch
new file mode 100644
index 000000000..0971bbec9
--- /dev/null
+++ b/package/gcc/patches/gcc-cppflags.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-4.4.4.orig/gcc/configure gcc-4.4.4/gcc/configure
+--- gcc-4.4.4.orig/gcc/configure	2009-10-19 14:15:27.000000000 +0200
++++ gcc-4.4.4/gcc/configure	2010-08-02 00:47:36.823620346 +0200
+@@ -13530,7 +13530,7 @@
+ 	esac
+ 	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+-	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
-- 
cgit v1.2.3