summaryrefslogtreecommitdiff
path: root/toolchain/glibc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-20 20:41:41 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-20 20:41:41 +0200
commit70c44baa23fbf86a888f6f37a75bca10a631a01c (patch)
treecf5d557fddf53ddb4851a0ae5db68c3ff9f5407e /toolchain/glibc
parentdd35f8739be06beda5a2e2d3f753056cf1fb724a (diff)
add eglibc support
all three libraries tested with qemu-x86
Diffstat (limited to 'toolchain/glibc')
-rw-r--r--toolchain/glibc/Makefile98
-rw-r--r--toolchain/glibc/Makefile.inc4
2 files changed, 48 insertions, 54 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index d1066bccd..0a93e123e 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -1,7 +1,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-_IN_CVTC= 1
+#_IN_CVTC= 1
include $(TOPDIR)/rules.mk
include ../rules.mk
@@ -9,35 +9,53 @@ include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk
+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_ARCH) -O2 -pipe" \
+ CC=${REAL_GNU_TARGET_NAME}-gcc \
+ CXX=${REAL_GNU_TARGET_NAME}-g++ \
+ AR=${REAL_GNU_TARGET_NAME}-ar \
+ RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
+ LD=${REAL_GNU_TARGET_NAME}-ld \
+ libc_cv_forced_unwind=yes \
+ libc_cv_c_cleanup=yes \
+ libc_cv_gnu99_inline=yes \
+
ifeq ($(ADK_DEVICE_NO_FPU),y)
-GLIBC_CONFOPTS:= --without-fp
+GLIBC_CONFOPTS+= --without-fp
endif
-GLIBC_BUILD_DIR:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
-GLIBC_BUILD_DIR2:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
+GLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
+GLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
$(WRKBUILD)/.headers_configure:
- mkdir -p $(GLIBC_BUILD_DIR)
- (cd $(GLIBC_BUILD_DIR); \
+ mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
+ (cd $(GLIBC_BUILD_DIR_INITIAL); \
$(WRKBUILD)/configure \
--prefix=/usr \
- --build=$(GNU_HOST_NAME) \
- --host=$(REAL_GNU_TARGET_NAME) \
- --disable-nls \
- --without-cvs \
- --with-__thread \
- --with-tls \
- --enable-add-ons \
- --enable-kernel="2.6.0" \
- --disable-sanity-checks \
- --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
--with-sysroot=$(TOOLCHAIN_SYSROOT) \
${GLIBC_CONFOPTS} \
);
touch $@
$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
- $(MAKE) -C $(GLIBC_BUILD_DIR) \
+ $(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
cross-compiling=yes \
install_root=$(TOOLCHAIN_SYSROOT) \
CFLAGS="-DBOOTSTRAP_GCC" install-headers
@@ -45,52 +63,28 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
touch $(TOOLCHAIN_SYSROOT)/usr/include/bits/stdio_lim.h
touch $@
-$(WRKBUILD)/.configure_done:
- mkdir -p $(GLIBC_BUILD_DIR2)
- (cd $(GLIBC_BUILD_DIR2); \
- PATH='${TARGET_PATH}' \
- BUILD_CC=gcc \
- CFLAGS="$(TARGET_CFLAGS_ARCH) -O2 -pipe" \
- CC=${REAL_GNU_TARGET_NAME}-gcc \
- AR=${REAL_GNU_TARGET_NAME}-ar \
- RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
- LD=${REAL_GNU_TARGET_NAME}-ld \
- libc_cv_forced_unwind=yes \
- libc_cv_c_cleanup=yes \
- libc_cv_gnu99_inline=yes \
+$(WRKBUILD)/.configured:
+ mkdir -p $(GLIBC_BUILD_DIR_FINAL)
+ (cd $(GLIBC_BUILD_DIR_FINAL); \
+ ${GLIBC_ENV} \
$(WRKBUILD)/configure \
- --prefix=/usr \
- --build=$(GNU_HOST_NAME) \
- --host=$(REAL_GNU_TARGET_NAME) \
- --disable-nls \
- --without-cvs \
- --disable-profile \
- --disable-debug \
- --without-gd \
- --enable-shared \
- --enable-stackguard-randomization \
- --with-__thread \
- --with-tls \
- --enable-add-ons \
- --enable-kernel=2.6.0 \
- --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
- ${GLIBC_CONFOPTS} \
+ --prefix=/usr \
+ --enable-shared \
+ --enable-stackguard-randomization \
+ ${GLIBC_CONFOPTS} \
);
touch $@
$(WRKBUILD)/.compiled:
- PATH='${TARGET_PATH}' \
+ ${GLIBC_ENV} \
CFLAGS="$(TARGET_CFLAGS_ARCH) -O2 -pipe" \
- CC=${REAL_GNU_TARGET_NAME}-gcc \
- LD=${REAL_GNU_TARGET_NAME}-ld \
- RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
- $(MAKE) -C $(GLIBC_BUILD_DIR2) lib \
+ $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) lib \
cross-compiling=yes
touch $@
$(WRKBUILD)/.installed:
PATH='${TARGET_PATH}' \
- $(MAKE) -C $(GLIBC_BUILD_DIR2) \
+ $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \
install_root=$(STAGING_DIR) \
install-lib-all install-headers \
install-others cross-compiling=yes
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 3e5d8b475..3ba08efa3 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,7 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= glibc
-PKG_VERSION:= 2.10.90
+PKG_VERSION:= 2.10.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= f1d6d30f762e0be537a1f84d26fa0403
+PKG_MD5SUM:= adfbd93cada84dc16259f4dffa60dc34
PKG_SITES:= http://www.openadk.org/distfiles