diff options
| -rw-r--r-- | rules/gcclibs.make | 2 | ||||
| -rw-r--r-- | rules/glibc.make | 39 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 61 | ||||
| -rwxr-xr-x | scripts/install_copy_toolchain.sh | 13 |
4 files changed, 33 insertions, 82 deletions
diff --git a/rules/gcclibs.make b/rules/gcclibs.make index 5b93121cc..4ed1b2bb7 100644 --- a/rules/gcclibs.make +++ b/rules/gcclibs.make @@ -3,7 +3,7 @@ # # Copyright (C) 2004 by Robert Schwebel # Marc Kleine-Budde <kleine-budde@gmx.de> -# 2005 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix +# 2005, 2006 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix # # See CREDITS for details about who has contributed to this project. # diff --git a/rules/glibc.make b/rules/glibc.make index 80ffae79e..02b7591ab 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -94,71 +94,71 @@ $(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps_default) @$(call install_fixup, glibc,DESCRIPTION,missing) ifdef PTXCONF_GLIBC - @$(call install_copy_toolchain_dl, glibc, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_dl, glibc, /lib) endif ifdef PTXCONF_GLIBC_LIBC - @$(call install_copy_toolchain_lib, glibc, libc.so.6, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libc.so.6) endif ifdef PTXCONF_GLIBC_PTHREAD - @$(call install_copy_toolchain_lib, glibc, libpthread.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libpthread.so) endif ifdef PTXCONF_GLIBC_THREAD_DB - @$(call install_copy_toolchain_lib, glibc, libthread_db.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libthread_db.so) endif ifdef PTXCONF_GLIBC_LIBRT - @$(call install_copy_toolchain_lib, glibc, librt.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, librt.so) endif ifdef PTXCONF_GLIBC_DL - @$(call install_copy_toolchain_lib, glibc, libdl.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libdl.so) endif ifdef PTXCONF_GLIBC_CRYPT - @$(call install_copy_toolchain_lib, glibc, libcrypt.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libcrypt.so) endif ifdef PTXCONF_GLIBC_UTIL - @$(call install_copy_toolchain_lib, glibc, libutil.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libutil.so) endif ifdef PTXCONF_GLIBC_LIBM - @$(call install_copy_toolchain_lib, glibc, libm.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libm.so) endif ifdef PTXCONF_GLIBC_NSS_DNS - @$(call install_copy_toolchain_lib, glibc, libnss_dns.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_dns.so) endif ifdef PTXCONF_GLIBC_NSS_FILES - @$(call install_copy_toolchain_lib, glibc, libnss_files.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_files.so) endif ifdef PTXCONF_GLIBC_NSS_HESIOD - @$(call install_copy_toolchain_lib, glibc, libnss_hesiod.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_hesiod.so) endif ifdef PTXCONF_GLIBC_NSS_NIS - @$(call install_copy_toolchain_lib, glibc, libnss_nis.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_nis.so) endif ifdef PTXCONF_GLIBC_NSS_NISPLUS - @$(call install_copy_toolchain_lib, glibc, libnss_nisplus.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_nisplus.so) endif ifdef PTXCONF_GLIBC_NSS_COMPAT - @$(call install_copy_toolchain_lib, glibc, libnss_compat.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnss_compat.so) endif ifdef PTXCONF_GLIBC_RESOLV - @$(call install_copy_toolchain_lib, glibc, libresolv.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libresolv.so) endif ifdef PTXCONF_GLIBC_NSL - @$(call install_copy_toolchain_lib, glibc, libnsl.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, libnsl.so) endif ifdef PTXCONF_GLIBC_GCONV @@ -166,7 +166,7 @@ ifdef PTXCONF_GLIBC_GCONV endif ifdef PTXCONF_GLIBC_GCONV_ISO8859_1 - @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so, /lib) echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \ >> $(ROOTDIR)/usr/lib/gconv/gconv-modules echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \ @@ -177,10 +177,9 @@ endif # Zonefiles @$(call install_copy, glibc, 0, 0, 0755, /usr/share/zoneinfo) - for target in $(GLIBC_ZONEFILES-y); do \ + @for target in $(GLIBC_ZONEFILES-y); do \ $(call install_copy, glibc, 0, 0, 0644, $(GLIBC_ZONEDIR)/zoneinfo/$$target, /usr/share/zoneinfo/$$target) \ done; - @$(call install_finish, glibc) @$(call touch, $@) diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 7707d8db8..b5bec23f8 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -20,7 +20,7 @@ DEP_TREE_PS = deptree.ps DEP_TREE_A4_PS = deptree-a4.ps SUDO = sudo -HOSTCC = gcc +HOSTCC = gcc-4.1 HOSTCXX = g++ DOT = dot SH = /bin/sh @@ -795,10 +795,10 @@ patchin = \ fi; \ \ if [ -f "$$patch_dir/series" ]; then \ - $(PTXDIST_TOPDIR)/scripts/apply_patch_series.sh -s "$$patch_dir/series" \ + $(SCRIPTSDIR)/apply_patch_series.sh -s "$$patch_dir/series" \ -d $$PACKET_DIR; \ else \ - $(PTXDIST_TOPDIR)/scripts/apply_patch_series.sh -p "$$patch_dir" \ + $(SCRIPTSDIR)/apply_patch_series.sh -p "$$patch_dir" \ -d $$PACKET_DIR ; \ fi @@ -934,58 +934,9 @@ install_copy_toolchain_lib = \ LIB="$(strip $2)"; \ DST="$(strip $3)"; \ STRIP="$(strip $4)"; \ - \ - LIB_DIR=`$(CROSS_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ - \ - if test \! -d "$${LIB_DIR}"; then \ - echo "install_copy_toolchain_lib: $${LIB_DIR} not found"; \ - exit -1; \ - fi; \ - \ - LIB="$(strip $2)"; \ - for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ - LIB=`basename $${FILE}`; \ - while test -n "$${LIB}"; do \ - echo "install_copy_toolchain_lib lib=$${LIB} dst=$${DST}"; \ - rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ - mkdir -p $(ROOTDIR)$${DST}; \ - rm -fr $(ROOTDIR_DEBUG)$${DST}/$${LIB}; \ - mkdir -p $(ROOTDIR_DEBUG)$${DST}; \ - mkdir -p $(IMAGEDIR)/$$PACKET/ipkg/$${DST}; \ - if test -h $${LIB_DIR}/$${LIB}; then \ - cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ - cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR_DEBUG)$${DST}/; \ - cp -d $${LIB_DIR}/$${LIB} $(IMAGEDIR)/$$PACKET/ipkg/$${DST}/; \ - elif test -f $${LIB_DIR}/$${LIB}; then \ - $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ - $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR_DEBUG)$${DST}/$${LIB}; \ - $(INSTALL) -D $${LIB_DIR}/$${LIB} $(IMAGEDIR)/$$PACKET/ipkg/$${DST}/$${LIB};\ - case "$${STRIP}" in \ - 0 | n | no) \ - ;; \ - *) \ - $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ - $(CROSS_STRIP) $(IMAGEDIR)/$$PACKET/ipkg/$${DST}/$${LIB};\ - ;; \ - esac; \ - mkdir -p $(IMAGEDIR)/$$PACKET; \ - echo "f:$${DST}/$${LIB}:0:0:755" >> $(STATEDIR)/$$PACKET.perms; \ - else \ - echo "error: found $${LIB}, but no file or link"; \ - echo; \ - exit -1; \ - fi; \ - LIB="`readlink $${LIB_DIR}/$${LIB} | sed s,^\\\\.,$${LIB_DIR}/\.,`"; \ - if [ -n "$$LIB" ]; then \ - if [ "`dirname $$LIB`" != "." ]; then \ - LIB_DIR=`dirname $$LIB`; \ - fi; \ - LIB=`basename $$LIB`; \ - fi; \ - done; \ - done; \ - \ - echo -n + test "$${DST}" != "" && DST="-d $${DST}"; \ + ${CROSS_ENV_CC} $(CROSS_ENV_STRIP) \ + $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${PACKET}" -l "$${LIB}" $${DST} -s "$${STRIP}" # # install_copy_toolchain_dl diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh index adfaac1e0..ca3ac563d 100755 --- a/scripts/install_copy_toolchain.sh +++ b/scripts/install_copy_toolchain.sh @@ -62,13 +62,14 @@ ptxd_install_lib() { # if the user has given us a $prefix use it prefix=${dest:-${prefix}} +# disabled cause tls is bad for UML # is there a tls variant of the lib? (e.g. native build on debian) - tls_lib="${lib_dir}/tls/${lib}" - if test -e "${tls_lib}"; then - echo "tls - ${tls_lib}" - ptxd_install_lib "${tls_lib}" - return 0 - fi +# tls_lib="${lib_dir}/tls/${lib}" +# if test -e "${tls_lib}"; then +# echo "tls - ${tls_lib}" +# ptxd_install_lib "${tls_lib}" +# return 0 +# fi # remove existing libs for dir in \ |