diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-07 19:20:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-07 19:20:16 +0100 |
| commit | e3d82f03e59751f2ab4888524f3c613c399b453a (patch) | |
| tree | d5c72b060b2384aea3cb3fc3f3ab53fb23278e13 /toolchain/glibc | |
| parent | 226c702c14a1d4751b6c08f0e874ca57a4f973d3 (diff) | |
fix eglibc/glibc toolchain building with make 3.82
Diffstat (limited to 'toolchain/glibc')
| -rw-r--r-- | toolchain/glibc/Makefile | 15 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 1 | ||||
| -rw-r--r-- | toolchain/glibc/patches/make-mixed.patch | 15 |
3 files changed, 24 insertions, 7 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 068006059..f97185ab5 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -13,8 +13,7 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+=-O2 endif -GLIBC_CONFOPTS:= \ - --build=$(GNU_HOST_NAME) \ +GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ --disable-nls \ @@ -54,11 +53,11 @@ 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-2.12-1/glibc-ports-2.12/ ports); + ln -sf ../../w-glibc-ports-$(GLIBC_PORTS_VERSION)-1/glibc-ports-$(GLIBC_PORTS_VERSION)/ ports); (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ - --prefix=/usr \ + --prefix=$(TOOLCHAIN_SYSROOT)/usr \ --with-sysroot=$(TOOLCHAIN_SYSROOT) \ ${GLIBC_CONFOPTS} \ ); @@ -66,10 +65,12 @@ $(WRKBUILD)/.headers_configure: $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib - -${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \ + (cd $(GLIBC_BUILD_DIR_INITIAL); \ + ${GLIBC_ENV} \ + $(MAKE) ${GLIBC_MAKEOPTS} \ cross-compiling=yes \ - install_root=$(TOOLCHAIN_SYSROOT) \ - install-headers + install-headers \ + ); touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h touch $@ diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 8ee1ad368..57f4c5aff 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -6,3 +6,4 @@ PKG_VERSION:= 2.12.1 PKG_RELEASE:= 1 PKG_MD5SUM:= a8e77cd873125d9b46ca2e46ee1a13d0 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} +GLIBC_PORTS_VERSION:= 2.12 diff --git a/toolchain/glibc/patches/make-mixed.patch b/toolchain/glibc/patches/make-mixed.patch new file mode 100644 index 000000000..7691eda95 --- /dev/null +++ b/toolchain/glibc/patches/make-mixed.patch @@ -0,0 +1,15 @@ +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 $@ + |