diff options
Diffstat (limited to 'rules/glibc.make')
| -rw-r--r-- | rules/glibc.make | 310 |
1 files changed, 192 insertions, 118 deletions
diff --git a/rules/glibc.make b/rules/glibc.make index f3f9b7063..467e9a407 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -1,11 +1,11 @@ # -*-makefile-*- -# $Id: glibc.make,v 1.9 2003/09/16 16:40:36 mkl Exp $ +# $Id: glibc.make,v 1.10 2003/10/23 15:01:19 mkl Exp $ # -# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany -# (c) 2002 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany +# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany # See CREDITS for details about who has contributed to this project. # -# For further information about the PTXDIST project and license conditions +# For further information about the PTXdist project and license conditions # see the README file. # @@ -13,27 +13,16 @@ # We provide this package # ifdef PTXCONF_GLIBC +ifdef PTXCONF_BUILD_CROSSCHAIN PACKAGES += glibc -DYNAMIC_LINKER = /lib/ld.so.1 +endif +DYNAMIC_LINKER = /lib/ld-linux.so.2 endif # # Paths and names # -ifeq (y, $(PTXCONF_GLIBC_2_3_2)) -GLIBC_VERSION = 2.3.2 -endif -ifeq (y, $(PTXCONF_GLIBC_2_2_5)) -GLIBC_VERSION = 2.2.5 -endif -ifeq (y, $(PTXCONF_GLIBC_2_2_4)) -GLIBC_VERSION = 2.2.4 -endif -ifeq (y, $(PTXCONF_GLIBC_2_2_3)) -GLIBC_VERSION = 2.2.3 -endif - GLIBC = glibc-$(GLIBC_VERSION) GLIBC_URL = ftp://ftp.gnu.org/gnu/glibc/$(GLIBC).tar.gz GLIBC_SOURCE = $(SRCDIR)/$(GLIBC).tar.gz @@ -52,24 +41,36 @@ GLIBC_BUILDDIR = $(BUILDDIR)/$(GLIBC)-build glibc_get: $(STATEDIR)/glibc.get -glibc_get_deps = $(GLIBC_SOURCE) +glibc_get_deps = \ + $(GLIBC_SOURCE) \ + $(STATEDIR)/glibc-patches.get ifdef PTXCONF_GLIBC_PTHREADS -glibc_get_deps += $(GLIBC_THREADS_SOURCE) +glibc_get_deps += \ + $(GLIBC_THREADS_SOURCE) \ + $(STATEDIR)/glibc-threads-patches.get endif $(STATEDIR)/glibc.get: $(glibc_get_deps) - @$(call targetinfo, glibc.get) + @$(call targetinfo, $@) + touch $@ + +$(STATEDIR)/glibc-patches.get: + @$(call targetinfo, $@) @$(call get_patches, $(GLIBC)) + touch $@ + +$(STATEDIR)/glibc-threads-patches.get: + @$(call targetinfo, $@) @$(call get_patches, $(GLIBC_THREADS)) touch $@ $(GLIBC_SOURCE): - @$(call targetinfo, $(GLIBC_SOURCE)) + @$(call targetinfo, $@) @$(call get, $(GLIBC_URL)) $(GLIBC_THREADS_SOURCE): - @$(call targetinfo, $(GLIBC_THREADS_SOURCE)) + @$(call targetinfo, $@) @$(call get, $(GLIBC_THREADS_URL)) # ---------------------------------------------------------------------------- @@ -79,23 +80,23 @@ $(GLIBC_THREADS_SOURCE): glibc_extract: $(STATEDIR)/glibc.extract glibc_extract_deps = $(STATEDIR)/glibc-base.extract -ifeq (y, $(PTXCONF_GLIBC_PTHREADS)) +ifdef PTXCONF_GLIBC_PTHREADS glibc_extract_deps += $(STATEDIR)/glibc-threads.extract endif $(STATEDIR)/glibc.extract: $(glibc_extract_deps) - @$(call targetinfo, glibc.extract) + @$(call targetinfo, $@) touch $@ $(STATEDIR)/glibc-base.extract: $(STATEDIR)/glibc.get - @$(call targetinfo, glibc-base.extract) + @$(call targetinfo, $@) @$(call clean, $(GLIBC_DIR)) @$(call extract, $(GLIBC_SOURCE)) @$(call patchin, $(GLIBC)) touch $@ $(STATEDIR)/glibc-threads.extract: $(STATEDIR)/glibc.get - @$(call targetinfo, glibc-threads.extract) + @$(call targetinfo, $@) @$(call extract, $(GLIBC_THREADS_SOURCE), $(GLIBC_DIR)) @$(call patchin, $(GLIBC_THREADS), $(GLIBC_DIR)) touch $@ @@ -109,33 +110,55 @@ glibc_prepare: $(STATEDIR)/glibc.prepare # # arcitecture dependend configuration # -GLIBC_AUTOCONF = --build=$(GNU_HOST) -GLIBC_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) -GLIBC_AUTOCONF += --disable-sanity-checks +GLIBC_AUTOCONF = \ + --build=$(GNU_HOST) \ + --host=$(PTXCONF_GNU_TARGET) \ + --with-headers=$(CROSS_LIB_DIR)/include \ + --enable-clocale=gnu \ + --without-tls \ + --without-cvs \ + --without-gd \ + --prefix=/usr \ + --libexecdir=/usr/bin + +ifdef GLIBC_OPTKERNEL +GLIBC_AUTOCONF += --enable-kernel=$(KERNEL_VERSION) +endif + +ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.2) GLIBC_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(CROSS_PATH) -GLIBC_ENV = $(CROSS_ENV) +else +#FIXME: wich autoconf version wants the glibc? +GLIBC_PATH = PATH=$(CROSS_PATH) +endif + +GLIBC_ENV = $(CROSS_ENV) BUILD_CC=$(HOSTCC) # # features # ifdef PTXCONF_GLIBC_LIBIO - GLIBC_AUTOCONF+=--enable-libio +GLIBC_AUTOCONF += --enable-libio endif + ifdef PTXCONF_GLIBC_SHARED - GLIBC_AUTOCONF+=--enable-shared +GLIBC_AUTOCONF += --enable-shared else - GLIBC_AUTOCONF+=--enable-shared=no +GLIBC_AUTOCONF += --enable-shared=no endif + ifdef PTXCONF_GLIBC_PROFILED - GLIBC_AUTOCONF+=--enable-profile=yes +GLIBC_AUTOCONF += --enable-profile=yes else - GLIBC_AUTOCONF+=--enable-profile=no +GLIBC_AUTOCONF += --enable-profile=no endif + ifdef PTXCONF_GLIBC_OMITFP - GLIBC_AUTOCONF+=--enable-omitfp +GLIBC_AUTOCONF += --enable-omitfp endif + ifdef PTXCONF_GLIBC_PTHREADS - GLIBC_AUTOCONF+=--enable-add-ons=linuxthreads +GLIBC_AUTOCONF += --enable-add-ons=linuxthreads endif GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG) @@ -144,19 +167,22 @@ GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG) # dependencies # glibc_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/autoconf213.install \ + $(STATEDIR)/xchain-gccstage1.install \ $(STATEDIR)/glibc.extract $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps) - @$(call targetinfo, glibc.prepare) + @$(call targetinfo, $@) mkdir -p $(GLIBC_BUILDDIR) - cd $(GLIBC_BUILDDIR) && \ - $(GLIBC_PATH) $(GLIBC_ENV) \ - $(GLIBC_DIR)/configure $(PTXCONF_GNU_TARGET) \ - $(GLIBC_AUTOCONF) \ - --prefix=/usr \ - --libexecdir=/usr/bin + cd $(GLIBC_BUILDDIR) && \ + $(GLIBC_PATH) $(GLIBC_ENV) \ + $(GLIBC_DIR)/configure $(PTXCONF_GNU_TARGET) \ + $(GLIBC_AUTOCONF) +# +# don't compile programs +# +# echo "build-programs=no" >> $(XCHAIN_GLIBC_BUILDDIR)/configparms + touch $@ # ---------------------------------------------------------------------------- @@ -166,8 +192,14 @@ $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps) glibc_compile: $(STATEDIR)/glibc.compile $(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare - @$(call targetinfo, glibc.compile) - cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make + @$(call targetinfo, $@) + $(GLIBC_PATH) make -C $(GLIBC_BUILDDIR) +# +# fake files which are installed by make install although +# compiling binaries was switched of (tested with 2.2.5) +# +# touch $(XCHAIN_GLIBC_BUILDDIR)/iconv/iconv_prog +# touch $(XCHAIN_GLIBC_BUILDDIR)/login/pt_chown touch $@ # ---------------------------------------------------------------------------- @@ -177,7 +209,33 @@ $(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare glibc_install: $(STATEDIR)/glibc.install $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile - @$(call targetinfo, glibc.install) + @$(call targetinfo, $@) + $(GLIBC_PATH) make -C $(GLIBC_BUILDDIR) \ + install_root=$(CROSS_LIB_DIR) prefix="" install +# +# Dan Kegel writes: +# +# Fix problems in linker scripts. +# +# 1. Remove absolute paths +# Any file in a list of known suspects that isn't a symlink is assumed to be a linker script. +# FIXME: test -h is not portable +# FIXME: probably need to check more files than just these three... +# Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks +# +# 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html, +# needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm +# + for file in libc.so libpthread.so libgcc_s.so; do \ + if [ -f $(CROSS_LIB_DIR)/lib/$$file -a ! -h $(CROSS_LIB_DIR)/lib/$$file ]; then \ + echo $$file; \ + if [ ! -f $(CROSS_LIB_DIR)/lib/$$file.orig ]; then \ + mv $(CROSS_LIB_DIR)/lib/$$file $(CROSS_LIB_DIR)/lib/$$file.orig; \ + fi; \ + sed 's,/lib/,,g;/BUG in libc.scripts.output-format.sed/d' < $(CROSS_LIB_DIR)/lib/$$file.orig \ + > $(CROSS_LIB_DIR)/lib/$$file; \ + fi; \ + done touch $@ # ---------------------------------------------------------------------------- @@ -186,102 +244,122 @@ $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile glibc_targetinstall: $(STATEDIR)/glibc.targetinstall -$(STATEDIR)/glibc.targetinstall: $(STATEDIR)/glibc.compile - @$(call targetinfo, glibc.targetinstall) - # CAREFUL: don't never ever make install in ldso tree!!! +ifdef PTXCONF_BUILD_CROSSCHAIN +glibc_targetinstall_deps = $(STATEDIR)/glibc.install +endif + +ifdef PTXCONF_GLIBC_DEBUG +GLIBC_STRIP = true +else +GLIBC_STRIP = $(CROSSSTRIP) -S -R .note -R .comment +endif + +ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.2) +GLIBC_PTHREAD_VERSION = 0.9 +else +GLIBC_PTHREAD_VERSION = 0.10 +endif + +$(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps) + @$(call targetinfo, $@) +# +# CAREFUL: don't never ever make install!!! +# but we never ever run ptxdist as root, do we? :) +# mkdir -p $(ROOTDIR)/lib - install $(GLIBC_BUILDDIR)/elf/ld.so $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so + install $(CROSS_LIB_DIR)/lib/ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so ln -sf ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld.so.1 ln -sf ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld-linux.so.2 - install $(GLIBC_BUILDDIR)/libc.so $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6 - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6 + install $(CROSS_LIB_DIR)/lib/libc-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6 + $(GLIBC_STRIP) $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6 ln -sf libc-$(GLIBC_VERSION).so.6 $(ROOTDIR)/lib/libc.so.6 - ifeq (y, $(PTXCONF_GLIBC_PTHREADS)) - install $(GLIBC_BUILDDIR)/linuxthreads/libpthread.so $(ROOTDIR)/lib/libpthread-0.9.so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libpthread-0.9.so - ln -sf libpthread-0.9.so $(ROOTDIR)/lib/libpthread.so.0 - endif +ifdef PTXCONF_GLIBC_PTHREADS + install $(CROSS_LIB_DIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so $(ROOTDIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so + ln -sf libpthread-$(GLIBC_PTHREAD_VERSION).so $(ROOTDIR)/lib/libpthread.so.0 +endif - ifeq (y, $(PTXCONF_GLIBC_THREAD_DB)) - install $(GLIBC_BUILDDIR)/linuxthreads_db/libthread_db.so $(ROOTDIR)/lib/libthread_db.so.1 - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libthread_db.so.1 - endif +ifdef PTXCONF_GLIBC_THREAD_DB + install $(CROSS_LIB_DIR)/lib/libthread_db.so $(ROOTDIR)/lib/libthread_db-1.0.so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libthread_db-1.0.so + ln -sf libthread_db-1.0.so $(ROOTDIR)/lib/libthread_db.so.1 +endif - ifeq (y, $(PTXCONF_GLIBC_DL)) - install $(GLIBC_BUILDDIR)/dlfcn/libdl.so $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_DL + install $(CROSS_LIB_DIR)/lib/libdl.so $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so ln -sf libdl-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libdl.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_CRYPT)) - install $(GLIBC_BUILDDIR)/crypt/libcrypt.so $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_CRYPT + install $(CROSS_LIB_DIR)/lib/libcrypt.so $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so ln -sf libcrypt-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libcrypt.so.1 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_UTIL)) - install $(GLIBC_BUILDDIR)/login/libutil.so $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_UTIL + install $(CROSS_LIB_DIR)/lib/libutil.so $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so ln -sf libutil-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libutil.so.1 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_LIBM)) - install $(GLIBC_BUILDDIR)/math/libm.so $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_LIBM + install $(CROSS_LIB_DIR)/lib/libm.so $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so ln -sf libm-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libm.so.6 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_DNS)) - install $(GLIBC_BUILDDIR)/resolv/libnss_dns.so.2 $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_DNS + install $(CROSS_LIB_DIR)/lib/libnss_dns.so.2 $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so ln -sf libnss_dns-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_dns.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_FILES)) - install $(GLIBC_BUILDDIR)/nss/libnss_files.so.2 $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_FILES + install $(CROSS_LIB_DIR)/lib/libnss_files.so.2 $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so ln -sf libnss_files-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_files.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_HESIOD)) - install $(GLIBC_BUILDDIR)/hesiod/libnss_hesiod.so.2 $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_HESIOD + install $(CROSS_LIB_DIR)/lib/libnss_hesiod.so.2 $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so ln -sf libnss_hesiod-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_hesiod.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_NIS)) - install $(GLIBC_BUILDDIR)/nis/libnss_nis.so.2 $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_NIS + install $(CROSS_LIB_DIR)/lib/libnss_nis.so.2 $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so ln -sf libnss_nis-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_nis.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_NISPLUS)) - install $(GLIBC_BUILDDIR)/nis/libnss_nisplus.so.2 $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_NISPLUS + install $(CROSS_LIB_DIR)/lib/libnss_nisplus.so.2 $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so ln -sf libnss_nisplus-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_nisplus.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSS_COMPAT)) - install $(GLIBC_BUILDDIR)/nis/libnss_compat.so.2 $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSS_COMPAT + install $(CROSS_LIB_DIR)/lib/libnss_compat.so.2 $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so ln -sf libnss_compat-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_compat.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_RESOLV)) - install $(GLIBC_BUILDDIR)/resolv/libresolv.so $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_RESOLV + install $(CROSS_LIB_DIR)/lib/libresolv.so $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so ln -sf libresolv-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libresolv.so.2 - endif +endif - ifeq (y, $(PTXCONF_GLIBC_NSL)) - install $(GLIBC_BUILDDIR)/nis/libnsl.so $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so +ifdef PTXCONF_GLIBC_NSL + install $(CROSS_LIB_DIR)/lib/libnsl.so $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so + $(GLIBC_STRIP) $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so ln -sf libnsl-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnsl.so.1 - endif +endif touch $@ @@ -290,11 +368,7 @@ $(STATEDIR)/glibc.targetinstall: $(STATEDIR)/glibc.compile # ---------------------------------------------------------------------------- glibc_clean: - -rm -rf $(STATEDIR)/xchain-glibc.extract - -rm -rf $(STATEDIR)/xchain-glibc.prepare - -rm -rf $(STATEDIR)/xchain-glibc.compile -rm -rf $(STATEDIR)/glibc* -rm -rf $(GLIBC_DIR) -rm -rf $(GLIBC_BUILDDIR) - -rm -rf $(XCHAIN_GLIBC_BUILDDIR) -# vim: syntax=make +: syntax=make |