diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/glibc-ports/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 10 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 6 | ||||
| -rw-r--r-- | toolchain/glibc/patches/ip_h-bug.patch | 12 | ||||
| -rw-r--r-- | toolchain/glibc/patches/make-mixed.patch | 15 |
5 files changed, 10 insertions, 39 deletions
diff --git a/toolchain/glibc-ports/Makefile.inc b/toolchain/glibc-ports/Makefile.inc index 64f1552f1..222728af3 100644 --- a/toolchain/glibc-ports/Makefile.inc +++ b/toolchain/glibc-ports/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= glibc-ports -PKG_VERSION:= 2.12 +PKG_VERSION:= 2.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= a6de5fd03fd89eb92ec77229d57e53d4 -PKG_SITES:= ${MASTER_SITE_OPENADK:=/} +PKG_MD5SUM:= 094e3c9b57da605917a780ab24575187 +PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index f466021a7..f52d527db 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -31,7 +31,7 @@ GLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final $(WRKBUILD)/.headers_configure: mkdir -p $(GLIBC_BUILD_DIR_INITIAL) (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../../w-glibc-ports-$(GLIBC_PORTS_VERSION)-1/glibc-ports-$(GLIBC_PORTS_VERSION)/ ports); + ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ @@ -70,10 +70,10 @@ $(WRKBUILD)/.installed: ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \ install_root=$(STAGING_TARGET_DIR) install mkdir -p ${STAGING_TARGET_DIR}/etc - ${INSTALL_DATA} ${WRKBUILD}/posix/gai.conf ${STAGING_TARGET_DIR}/etc/ - ${INSTALL_DATA} ${WRKBUILD}/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/ - ${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/ + ${INSTALL_DATA} ${WRKBUILD}/posix/gai.conf ${STAGING_TARGET_DIR}/etc + ${INSTALL_DATA} ${WRKBUILD}/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc + ${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(WRKBUILD)/.installed + touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index b7646e6a2..a9f838300 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -2,15 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= glibc -PKG_VERSION:= 2.12.1 +PKG_VERSION:= 2.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= a8e77cd873125d9b46ca2e46ee1a13d0 +PKG_MD5SUM:= fafabe01cb9748acb0a11a6879ebaa7e PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} -GLIBC_PORTS_VERSION:= 2.12 GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ - --disable-nls \ --disable-sanity-checks \ --disable-nls \ --without-cvs \ diff --git a/toolchain/glibc/patches/ip_h-bug.patch b/toolchain/glibc/patches/ip_h-bug.patch deleted file mode 100644 index 946c18fab..000000000 --- a/toolchain/glibc/patches/ip_h-bug.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h glibc-2.12.1/sysdeps/generic/netinet/ip.h ---- glibc-2.12.1.orig/sysdeps/generic/netinet/ip.h 2010-07-27 13:34:39.000000000 +0200 -+++ glibc-2.12.1/sysdeps/generic/netinet/ip.h 2010-10-13 15:00:56.000000000 +0200 -@@ -194,7 +194,7 @@ - */ - - #define IPTOS_CLASS_MASK 0xe0 --#define IPTOS_CLASS(class) ((tos) & IPTOS_CLASS_MASK) -+#define IPTOS_CLASS(class) ((class) & IPTOS_CLASS_MASK) - #define IPTOS_CLASS_CS0 0x00 - #define IPTOS_CLASS_CS1 0x20 - #define IPTOS_CLASS_CS2 0x40 diff --git a/toolchain/glibc/patches/make-mixed.patch b/toolchain/glibc/patches/make-mixed.patch deleted file mode 100644 index 7691eda95..000000000 --- a/toolchain/glibc/patches/make-mixed.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur glibc-2.12.1.orig/manual/Makefile glibc-2.12.1/manual/Makefile ---- glibc-2.12.1.orig/manual/Makefile 2010-07-27 13:34:39.000000000 +0200 -+++ glibc-2.12.1/manual/Makefile 2010-11-07 18:24:27.000000000 +0100 -@@ -232,7 +232,10 @@ - .PHONY: stubs - stubs: $(objpfx)stubs - endif --$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: -+$(objpfx)stubs ../po/manual.pot: -+ touch $@ -+ -+$(objpfx)stamp%: - $(make-target-directory) - touch $@ - |