From 29ff12f95706e0abeab5c054c66b3c6687e6515b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 23 Nov 2010 21:24:28 +0100
Subject: install symlinks for glibc-dev package, do not install libnsl for now

---
 toolchain/glibc/Makefile     | 27 ---------------------------
 toolchain/glibc/Makefile.inc | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 27 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index f97185ab5..47a7b9d6b 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -4,7 +4,6 @@
 include $(TOPDIR)/rules.mk
 include ../rules.mk
 include Makefile.inc
-
 include ${TOPDIR}/mk/buildhlp.mk
 
 # glibc does not compile with Os
@@ -13,32 +12,6 @@ ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=-O2
 endif
 
-GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
-			--host=$(REAL_GNU_TARGET_NAME) \
-			--with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
-			--disable-nls \
-			--disable-sanity-checks \
-			--without-cvs \
-			--disable-profile \
-			--disable-debug \
-			--enable-kernel="2.6.0" \
-			--without-gd \
-			--with-__thread \
-			--with-tls \
-			--enable-add-ons
-
-GLIBC_ENV:=		PATH='${TARGET_PATH}' \
-			BUILD_CC=${HOSTCC} \
-			CFLAGS="$(TARGET_CFLAGS)" \
-			CC=${REAL_GNU_TARGET_NAME}-gcc \
-			CXX=${REAL_GNU_TARGET_NAME}-g++ \
-			AR=${REAL_GNU_TARGET_NAME}-ar \
-			RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
-			libc_cv_forced_unwind=yes \
-			libc_cv_c_cleanup=yes \
-			libc_cv_gnu99_inline=yes \
-			libc_cv_slibdir="/lib"
-
 ifeq ($(ADK_TARGET_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
 endif
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 57f4c5aff..414790a23 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -7,3 +7,27 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a8e77cd873125d9b46ca2e46ee1a13d0
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 GLIBC_PORTS_VERSION:=	2.12
+GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
+			--host=$(REAL_GNU_TARGET_NAME) \
+			--with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
+			--disable-nls \
+			--disable-sanity-checks \
+			--disable-nls \
+			--without-cvs \
+			--disable-profile \
+			--disable-debug \
+			--without-gd \
+			--with-__thread \
+			--with-tls \
+			--enable-kernel="2.6.0" \
+			--enable-add-ons
+GLIBC_ENV:=             PATH='${TARGET_PATH}' \
+                        BUILD_CC=${HOSTCC} \
+                        CFLAGS="$(TARGET_CFLAGS)" \
+                        CC=${REAL_GNU_TARGET_NAME}-gcc \
+                        CXX=${REAL_GNU_TARGET_NAME}-g++ \
+                        AR=${REAL_GNU_TARGET_NAME}-ar \
+                        RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
+                        libc_cv_forced_unwind=yes \
+                        libc_cv_c_cleanup=yes \
+                        libc_cv_gnu99_inline=yes \
-- 
cgit v1.2.3