diff options
| -rw-r--r-- | package/eglibc/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile.inc | 5 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/gcc-linker.patch | 15 |
4 files changed, 4 insertions, 21 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 9f37255cf..d9acdb8fd 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -9,6 +9,7 @@ PKG_DESCR:= embedded GNU C library PKG_SECTION:= base PKG_OPTS:= noremove PKG_SUBPKGS:= EGLIBC EGLIBC_DEV EGLIBC_STATIC +PKG_DEPENDS:= tzdata NO_DISTFILES:= 1 diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 0961e7bca..58e8e4d72 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -26,8 +26,6 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y) $(WRKBUILD)/.headers_configure: for abi in $(TABI); do \ mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc); \ $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}/option-groups.config; \ (cd $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ @@ -56,8 +54,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure else $(WRKBUILD)/.headers_configure: mkdir -p $(EGLIBC_BUILD_DIR_INITIAL) - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc); $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ $(EGLIBC_BUILD_DIR_INITIAL)/option-groups.config (cd $(EGLIBC_BUILD_DIR_INITIAL); \ diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index d72693fd8..7fc25305c 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= eglibc -PKG_VERSION:= 2.16 +PKG_VERSION:= 2.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= 97b0956c312e747dcead4c9459ac2aa5 +PKG_MD5SUM:= 7bbee592be7d7fcacdc9dda931db9bec PKG_SITES:= http://openadk.org/distfiles/ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --without-cvs \ @@ -12,6 +12,7 @@ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --disable-debug \ --enable-kernel=2.6.0 \ --without-gd \ + --disable-nscd \ --with-__thread \ --with-tls \ --enable-add-ons \ diff --git a/toolchain/eglibc/patches/gcc-linker.patch b/toolchain/eglibc/patches/gcc-linker.patch deleted file mode 100644 index 4944066dc..000000000 --- a/toolchain/eglibc/patches/gcc-linker.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur eglibc-2.16.orig/libc/Makeconfig eglibc-2.16/libc/Makeconfig ---- eglibc-2.16.orig/libc/Makeconfig 2012-07-31 09:00:21.000000000 +0200 -+++ eglibc-2.16/libc/Makeconfig 2012-08-30 13:01:34.000000000 +0200 -@@ -521,9 +521,9 @@ - else - libunwind = -lunwind - endif --libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed -+libgcc_eh := -Wl,--as-needed $(libunwind) -Wl,--no-as-needed - gnulib := -lgcc $(libgcc_eh) --static-gnulib := -lgcc -lgcc_eh $(libunwind) -+static-gnulib := -lgcc $(libunwind) - libc.so-gnulib := -lgcc - endif - +preinit = $(addprefix $(csu-objpfx),crti.o) |