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/eglibc | |
| parent | 226c702c14a1d4751b6c08f0e874ca57a4f973d3 (diff) | |
fix eglibc/glibc toolchain building with make 3.82
Diffstat (limited to 'toolchain/eglibc')
| -rw-r--r-- | toolchain/eglibc/Makefile | 16 | ||||
| -rw-r--r-- | toolchain/eglibc/eglibc.config | 15 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/make-mixed-rules.patch | 15 |
3 files changed, 32 insertions, 14 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 863cd88ba..7f12ce725 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -11,10 +11,8 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+= -O2 endif -EGLIBC_CONFOPTS:= \ - --build=$(GNU_HOST_NAME) \ +EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ --disable-nls \ --without-cvs \ --disable-profile \ @@ -49,7 +47,7 @@ $(WRKBUILD)/.headers_configure: (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) + $(EGLIBC_BUILD_DIR_INITIAL)/option-groups.config (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ $(WRKBUILD)/libc/configure \ @@ -60,16 +58,16 @@ $(WRKBUILD)/.headers_configure: touch $@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure - mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib - PATH='${TARGET_PATH}' \ - $(MAKE) -C $(EGLIBC_BUILD_DIR_INITIAL) \ - install-headers install-bootstrap-headers=yes + (cd $(EGLIBC_BUILD_DIR_INITIAL); \ + PATH='${TARGET_PATH}' \ + $(MAKE) install-headers install-bootstrap-headers=yes \ + ); touch $@ $(WRKBUILD)/.configured: mkdir -p $(EGLIBC_BUILD_DIR_FINAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ - $(EGLIBC_BUILD_DIR_FINAL) + $(EGLIBC_BUILD_DIR_FINAL)/option-groups.config (cd $(EGLIBC_BUILD_DIR_FINAL); \ ${EGLIBC_ENV} \ $(WRKBUILD)/libc/configure \ diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config index b7f5f96e1..102bfc039 100644 --- a/toolchain/eglibc/eglibc.config +++ b/toolchain/eglibc/eglibc.config @@ -13,8 +13,10 @@ OPTION_EGLIBC_BACKTRACE = n OPTION_EGLIBC_BIG_MACROS = y OPTION_EGLIBC_BSD = y OPTION_EGLIBC_CXX_TESTS = n -OPTION_EGLIBC_CATGETS = n +OPTION_EGLIBC_CATGETS = y OPTION_EGLIBC_CHARSETS = n +OPTION_EGLIBC_CRYPT = y +OPTION_EGLIBC_CRYPT_UFC = y OPTION_EGLIBC_DB_ALIASES = n OPTION_EGLIBC_ENVZ = y OPTION_EGLIBC_FCVT = y @@ -22,14 +24,17 @@ OPTION_EGLIBC_FMTMSG = y OPTION_EGLIBC_FSTAB = y OPTION_EGLIBC_FTRAVERSE = y OPTION_EGLIBC_GETLOGIN = y +OPTION_EGLIBC_IDN = n OPTION_EGLIBC_INET = y +OPTION_EGLIBC_INET_ANL = y OPTION_EGLIBC_LIBM = y -OPTION_EGLIBC_LOCALES = n -OPTION_EGLIBC_LOCALE_CODE = n +OPTION_EGLIBC_LOCALES = y +OPTION_EGLIBC_LOCALE_CODE = y OPTION_EGLIBC_MEMUSAGE = y OPTION_EGLIBC_NIS = n -OPTION_EGLIBC_NSSWITCH = n -OPTION_EGLIBC_RCMD = y +OPTION_EGLIBC_NSSWITCH = y +OPTION_EGLIBC_RCMD = n +OPTION_EGLIBC_RTLD_DEBUG = y OPTION_EGLIBC_SPAWN = y OPTION_EGLIBC_STREAMS = y OPTION_EGLIBC_SUNRPC = y diff --git a/toolchain/eglibc/patches/make-mixed-rules.patch b/toolchain/eglibc/patches/make-mixed-rules.patch new file mode 100644 index 000000000..06a4af3c0 --- /dev/null +++ b/toolchain/eglibc/patches/make-mixed-rules.patch @@ -0,0 +1,15 @@ +diff -Nur eglibc-2.12.1.orig/libc/manual/Makefile eglibc-2.12.1/libc/manual/Makefile +--- eglibc-2.12.1.orig/libc/manual/Makefile 2010-09-28 19:14:30.000000000 +0200 ++++ eglibc-2.12.1/libc/manual/Makefile 2010-11-06 17:05:03.000000000 +0100 +@@ -243,7 +243,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 $@ + |