diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-03-19 20:23:26 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-03-19 20:23:26 +0000 |
| commit | 9f5eb82ea0735b417968729df2c72204df98e730 (patch) | |
| tree | 50386a9508757543a9392c96e12b160dc7b9ac77 /rules | |
| parent | 16f9a25e7b1502ab464febd2efd6c907f1e0b766 (diff) | |
| download | ptxdist-9f5eb82ea0735b417968729df2c72204df98e730.tar.gz ptxdist-9f5eb82ea0735b417968729df2c72204df98e730.tar.xz | |
merged abandon-glibc trunk
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2380 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
48 files changed, 220 insertions, 679 deletions
diff --git a/rules/Rules.make b/rules/Rules.make index 15f1bc2f9..748576b15 100644 --- a/rules/Rules.make +++ b/rules/Rules.make @@ -902,29 +902,29 @@ feature_patchin = \ # $5: destination (for files); empty (for directories). Prefixed with $(ROOTDIR), # so it needs to have a leading / # -copy_root = \ - @OWN=`echo $(1) | sed -e 's/[[:space:]]//g'`; \ - GRP=`echo $(2) | sed -e 's/[[:space:]]//g'`; \ - PER=`echo $(3) | sed -e 's/[[:space:]]//g'`; \ - SRC=`echo $(4) | sed -e 's/[[:space:]]//g'`; \ - DST=`echo $(5) | sed -e 's/[[:space:]]//g'`; \ - if [ -z "$(5)" ]; then \ - echo "copy_root dir=$$SRC owner=$$OWN group=$$GRP permissions=$$PER"; \ - $(INSTALL) -d $(ROOTDIR)/$$SRC; \ - if [ $$? -ne 0 ]; then \ - echo "Error: copy_root failed!"; \ - exit -1; \ - fi; \ - echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(TOPDIR)/permissions; \ - else \ - echo "copy_root src=$$SRC dst=$$DST owner=$$OWN group=$$GRP permissions=$$PER"; \ - rm -fr $(ROOTDIR)$$DST; \ - $(INSTALL) -D $$SRC $(ROOTDIR)$$DST; \ - if [ $$? -ne 0 ]; then \ - echo "Error: copy_root failed!"; \ - exit -1; \ - fi; \ - echo "f:$$DST:$$OWN:$$GRP:$$PER" >> $(TOPDIR)/permissions; \ +copy_root = \ + @OWN=`echo $(1) | sed -e 's/[[:space:]]//g'`; \ + GRP=`echo $(2) | sed -e 's/[[:space:]]//g'`; \ + PER=`echo $(3) | sed -e 's/[[:space:]]//g'`; \ + SRC=`echo $(4) | sed -e 's/[[:space:]]//g'`; \ + DST=`echo $(5) | sed -e 's/[[:space:]]//g'`; \ + if [ -z "$(5)" ]; then \ + echo "copy_root dir=$$SRC owner=$$OWN group=$$GRP permissions=$$PER"; \ + $(INSTALL) -d $(ROOTDIR)/$$SRC; \ + if [ $$? -ne 0 ]; then \ + echo "Error: copy_root failed!"; \ + exit -1; \ + fi; \ + echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(TOPDIR)/permissions; \ + else \ + echo "copy_root src=$$SRC dst=$$DST owner=$$OWN group=$$GRP permissions=$$PER"; \ + rm -fr $(ROOTDIR)$$DST; \ + $(INSTALL) -D $$SRC $(ROOTDIR)$$DST; \ + if [ $$? -ne 0 ]; then \ + echo "Error: copy_root failed!"; \ + exit -1; \ + fi; \ + echo "f:$$DST:$$OWN:$$GRP:$$PER" >> $(TOPDIR)/permissions; \ fi; @@ -968,44 +968,105 @@ node_root = \ echo "n:$$DEV:$$OWN:$$GRP:$$PER:$$TYP:$$MAJ:$$MIN" >> $(TOPDIR)/permissions # -# copy_lib_root +# copy_toolchain_lib_root # # $1: source # $2: destination +# $2: strip (y|n) default is to strip # -copy_lib_root = \ +copy_toolchain_lib_root = \ LIB="$(strip $1)"; \ DST="$(strip $2)"; \ + STRIP="$(strip $3)"; \ \ - LIB_DIR=`$(CROSS_CC) -print-file-name=$$LIB | sed -e "s/$$LIB\$$//" -e "s,/$$,,"`; \ + LIB_DIR=`$(CROSS_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ \ if test -z "$${LIB_DIR}"; then \ - echo "copy_lib_root: lib=$${LIB} not found"; \ + echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ exit -1; \ fi; \ \ - while test \! -z "$${LIB}"; do \ - echo "copy_lib_root lib=$${LIB} dst=$${DST}"; \ - rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ - mkdir -p $(ROOTDIR)$${DST}; \ - if test -h $${LIB_DIR}/$${LIB}; then \ - cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ - elif test -f $${LIB_DIR}/$${LIB}; then \ - $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ - $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ - echo "f:$${DST}/$${LIB}:0:0:755" >> $(TOPDIR)/permissions; \ - else \ - exit; \ - fi; \ - LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + LIB="$(strip $1)"; \ + for FILE in `find $${LIB_DIR} -type l -name "$${LIB}*" -maxdepth 1`; do \ + LIB=`basename $${FILE}`; \ + while test \! -z "$${LIB}"; do \ + echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ + mkdir -p $(ROOTDIR)$${DST}; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ + case "$${STRIP}" in \ + (0 | n | no) \ + ;; \ + (*) \ + $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ + ;; \ + esac; \ + echo "f:$${DST}/$${LIB}:0:0:755" >> $(TOPDIR)/permissions; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ done; \ \ - LIB="$(strip $1)"; \ - for LINK in `find $${LIB_DIR} -type l -name "$${LIB}*" -maxdepth 1`; do \ - cp -d $${LINK} $(ROOTDIR)$${DST}/; \ + echo -n + + +# +# copy_dl_root +# +# $1: destination +# $2: strip (y|n) default is to strip +# +copy_toolchain_dl_root = \ + DST="$(strip $1)"; \ + STRIP="$(strip $2)"; \ + \ + LIB="`echo 'int main(void){return 0;}' | \ + $(CROSS_CC) -x c -o /dev/null -v - 2>&1 | \ + grep dynamic-linker | \ + perl -n -p -e 's/.* -dynamic-linker ([^ ]*).*/\1/'`"; \ + \ + LIB="`basename $${LIB}`"; \ + \ + LIB_DIR=`$(CROSS_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ + \ + if test -z "$${LIB_DIR}"; then \ + echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ + exit -1; \ + fi; \ + \ + for FILE in `find $${LIB_DIR} -type l -name "$${LIB}*" -maxdepth 1`; do \ + LIB=`basename $${FILE}`; \ + while test \! -z "$${LIB}"; do \ + echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ + mkdir -p $(ROOTDIR)$${DST}; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ + case "$${STRIP}" in \ + (0 | n | no) \ + ;; \ + (*) \ + $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ + ;; \ + esac; \ + echo "f:$${DST}/$${LIB}:0:0:755" >> $(TOPDIR)/permissions; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ done; \ \ echo -n + + # vim: syntax=make diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make index 532769173..9d240d1db 100644 --- a/rules/autoconf-2.13.make +++ b/rules/autoconf-2.13.make @@ -17,7 +17,7 @@ # Paths and names # AUTOCONF213 = autoconf-2.13 -AUTOCONF213_URL = ftp://ftp.gnu.org/pub/gnu/autoconf/$(AUTOCONF213).tar.gz +AUTOCONF213_URL = $(PTXCONF_GNUMIRROR)/autoconf/$(AUTOCONF213).tar.gz AUTOCONF213_SOURCE = $(SRCDIR)/$(AUTOCONF213).tar.gz AUTOCONF213_DIR = $(BUILDDIR)/$(AUTOCONF213) diff --git a/rules/autoconf-2.57.make b/rules/autoconf-2.57.make index 85962e0e3..476347fae 100644 --- a/rules/autoconf-2.57.make +++ b/rules/autoconf-2.57.make @@ -17,7 +17,7 @@ # Paths and names # AUTOCONF257 = autoconf-2.57 -AUTOCONF257_URL = ftp://ftp.gnu.org/pub/gnu/autoconf/$(AUTOCONF257).tar.gz +AUTOCONF257_URL = $(PTXCONF_GNUMIRROR)/autoconf/$(AUTOCONF257).tar.gz AUTOCONF257_SOURCE = $(SRCDIR)/$(AUTOCONF257).tar.gz AUTOCONF257_DIR = $(BUILDDIR)/$(AUTOCONF257) diff --git a/rules/automake-1.5.make b/rules/automake-1.5.make index 93220d7b2..71b22871e 100644 --- a/rules/automake-1.5.make +++ b/rules/automake-1.5.make @@ -15,7 +15,7 @@ AUTOMAKE15_VERSION = 1.5 AUTOMAKE15 = automake-$(AUTOMAKE15_VERSION) AUTOMAKE15_SUFFIX = tar.gz -AUTOMAKE15_URL = http://ftp.gwdg.de/pub/gnu/automake/$(AUTOMAKE15).$(AUTOMAKE15_SUFFIX) +AUTOMAKE15_URL = $(PTXCONF_GNUMIRROR)/automake/$(AUTOMAKE15).$(AUTOMAKE15_SUFFIX) AUTOMAKE15_SOURCE = $(SRCDIR)/$(AUTOMAKE15).$(AUTOMAKE15_SUFFIX) AUTOMAKE15_DIR = $(BUILDDIR)/$(AUTOMAKE15) diff --git a/rules/automake-1.7.6.make b/rules/automake-1.7.6.make index f0a8230a7..a119e3293 100644 --- a/rules/automake-1.7.6.make +++ b/rules/automake-1.7.6.make @@ -15,7 +15,7 @@ AUTOMAKE176_VERSION = 1.7.6 AUTOMAKE176 = automake-$(AUTOMAKE176_VERSION) AUTOMAKE176_SUFFIX = tar.bz2 -AUTOMAKE176_URL = http://ftp.gwdg.de/pub/gnu/automake/$(AUTOMAKE176).$(AUTOMAKE176_SUFFIX) +AUTOMAKE176_URL = $(PTXCONF_GNUMIRROR)/automake/$(AUTOMAKE176).$(AUTOMAKE176_SUFFIX) AUTOMAKE176_SOURCE = $(SRCDIR)/$(AUTOMAKE176).$(AUTOMAKE176_SUFFIX) AUTOMAKE176_DIR = $(BUILDDIR)/$(AUTOMAKE176) diff --git a/rules/bash.make b/rules/bash.make index 6c9a4cfdf..8cdef5aa8 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -19,7 +19,7 @@ endif # Paths and names # BASH = bash-3.0 -BASH_URL = ftp://ftp.gnu.org/pub/gnu/bash/$(BASH).tar.gz +BASH_URL = $(PTXCONF_GNUMIRROR)/bash/$(BASH).tar.gz BASH_SOURCE = $(SRCDIR)/$(BASH).tar.gz BASH_DIR = $(BUILDDIR)/$(BASH) diff --git a/rules/betaftpd.make b/rules/betaftpd.make index a7b09b1c3..493924167 100644 --- a/rules/betaftpd.make +++ b/rules/betaftpd.make @@ -22,7 +22,7 @@ endif BETAFTPD_VERSION = 0.0.8pre17 BETAFTPD = betaftpd-$(BETAFTPD_VERSION) BETAFTPD_SUFFIX = tar.gz -BETAFTPD_URL = http://betaftpd.sourceforge.net/download/$(BETAFTPD).$(BETAFTPD_SUFFIX) +BETAFTPD_URL = $(PTXCONF_SFMIRROR)/betaftpd/$(BETAFTPD).$(BETAFTPD_SUFFIX) BETAFTPD_SOURCE = $(SRCDIR)/$(BETAFTPD).$(BETAFTPD_SUFFIX) BETAFTPD_DIR = $(BUILDDIR)/$(BETAFTPD) diff --git a/rules/binutils.make b/rules/binutils.make index d0f4d4c48..d5b7ab35e 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -16,7 +16,7 @@ endif # Paths and names # BINUTILS = binutils-$(PTXCONF_BINUTILS_VERSION) -BINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(BINUTILS).tar.gz +BINUTILS_URL = $(PTXCONF_GNUMIRROR)/binutils/$(BINUTILS).tar.gz BINUTILS_SOURCE = $(SRCDIR)/$(BINUTILS).tar.gz BINUTILS_DIR = $(BUILDDIR)/$(BINUTILS) BINUTILS_BUILDDIR = $(BINUTILS_DIR)-build diff --git a/rules/blackbox.make b/rules/blackbox.make index dcfe14f74..f786007aa 100644 --- a/rules/blackbox.make +++ b/rules/blackbox.make @@ -22,7 +22,7 @@ endif BLACKBOX_VERSION = 0.65.0 BLACKBOX = blackbox-$(BLACKBOX_VERSION) BLACKBOX_SUFFIX = tar.gz -BLACKBOX_URL = http://heanet.dl.sourceforge.net/sourceforge/blackboxwm/$(BLACKBOX).$(BLACKBOX_SUFFIX) +BLACKBOX_URL = $(PTXCONF_SFMIRROR)/blackboxwm/$(BLACKBOX).$(BLACKBOX_SUFFIX) BLACKBOX_SOURCE = $(SRCDIR)/$(BLACKBOX).$(BLACKBOX_SUFFIX) BLACKBOX_DIR = $(BUILDDIR)/$(BLACKBOX) @@ -85,7 +85,7 @@ BLACKBOX_AUTOCONF += --x-libraries=/home/koan/ptxdist/ptxdist-testing/root/usr/X #BLACKBOX_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11 \ #BLACKBOX_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib \ - + $(STATEDIR)/blackbox.prepare: $(blackbox_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(BLACKBOX_DIR)/config.cache) diff --git a/rules/clementine.make b/rules/clementine.make index 760e3798c..12b5cbb09 100644 --- a/rules/clementine.make +++ b/rules/clementine.make @@ -22,7 +22,7 @@ endif CLEMENTINE_VERSION = 0.0.7 CLEMENTINE = clementine-$(CLEMENTINE_VERSION) CLEMENTINE_SUFFIX = tar.gz -CLEMENTINE_URL = http://belnet.dl.sourceforge.net/sourceforge/clementine/$(CLEMENTINE).$(CLEMENTINE_SUFFIX) +CLEMENTINE_URL = $(PTXCONF_SFMIRROR)/clementine/$(CLEMENTINE).$(CLEMENTINE_SUFFIX) CLEMENTINE_SOURCE = $(SRCDIR)/$(CLEMENTINE).$(CLEMENTINE_SUFFIX) CLEMENTINE_DIR = $(BUILDDIR)/$(CLEMENTINE) diff --git a/rules/coreutils.make b/rules/coreutils.make index 69025e119..2476656c8 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -19,7 +19,7 @@ endif # Paths and names # COREUTILS = coreutils-5.0 -COREUTILS_URL = http://ftp.gnu.org/pub/gnu/coreutils/$(COREUTILS).tar.bz2 +COREUTILS_URL = $(PTXCONF_GNUMIRROR)/coreutils/$(COREUTILS).tar.bz2 COREUTILS_SOURCE = $(SRCDIR)/$(COREUTILS).tar.bz2 COREUTILS_DIR = $(BUILDDIR)/$(COREUTILS) diff --git a/rules/cramfs.make b/rules/cramfs.make index 4f159ef27..297395ee6 100644 --- a/rules/cramfs.make +++ b/rules/cramfs.make @@ -21,7 +21,7 @@ endif # CRAMFS = cramfs-1.1 CRAMFS_SUFFIX = tar.gz -CRAMFS_URL = http://umn.dl.sourceforge.net/sourceforge/cramfs/$(CRAMFS).$(CRAMFS_SUFFIX) +CRAMFS_URL = $(PTXCONF_SFMIRROR)/cramfs/$(CRAMFS).$(CRAMFS_SUFFIX) CRAMFS_SOURCE = $(SRCDIR)/$(CRAMFS).$(CRAMFS_SUFFIX) CRAMFS_DIR = $(BUILDDIR)/$(CRAMFS) diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index fe3b5b4c2..092e11412 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2002, 2003, 2004, 2005 by Pengutronix e.K., Hildesheim, Germany # # See CREDITS for details about who has contributed to this project. # @@ -22,7 +22,7 @@ endif E2FSPROGS_VERSION = 1.35 E2FSPROGS = e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX = tar.gz -E2FSPROGS_URL = http://ovh.dl.sourceforge.net/sourceforge/e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX) +E2FSPROGS_URL = $(PTXCONF_SFMIRROR)/e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX) E2FSPROGS_SOURCE = $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX) E2FSPROGS_DIR = $(BUILDDIR)/$(E2FSPROGS) E2FSPROGS_BUILD_DIR = $(BUILDDIR)/$(E2FSPROGS)-build diff --git a/rules/etherwake.make b/rules/etherwake.make index 6cab758cd..ecd8ecb8c 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -22,7 +22,7 @@ endif ETHERWAKE_VERSION = 1.08 ETHERWAKE = etherwake-$(ETHERWAKE_VERSION).orig ETHERWAKE_SUFFIX = tar.gz -ETHERWAKE_URL = $(PTXCONF_DEBPOOLM)/pool/main/e/etherwake/etherwake_$(ETHERWAKE_VERSION).orig.$(ETHERWAKE_SUFFIX) +ETHERWAKE_URL = $(PTXCONF_DEBMIRROR)/pool/main/e/etherwake/etherwake_$(ETHERWAKE_VERSION).orig.$(ETHERWAKE_SUFFIX) ETHERWAKE_SOURCE = $(SRCDIR)/etherwake_$(ETHERWAKE_VERSION).orig.$(ETHERWAKE_SUFFIX) ETHERWAKE_DIR = $(BUILDDIR)/$(ETHERWAKE) diff --git a/rules/expat.make b/rules/expat.make index 4251c927e..fc98c2726 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -23,7 +23,7 @@ endif EXPAT_VERSION = 1.95.8 EXPAT = expat-$(EXPAT_VERSION) EXPAT_SUFFIX = tar.gz -EXPAT_URL = http://mesh.dl.sourceforge.net/sourceforge/expat/$(EXPAT).$(EXPAT_SUFFIX) +EXPAT_URL = $(PTXCONF_SFMIRROR)/expat/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_SOURCE = $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_DIR = $(BUILDDIR)/$(EXPAT) diff --git a/rules/gawk.make b/rules/gawk.make index 430222df8..947cda0e3 100644 --- a/rules/gawk.make +++ b/rules/gawk.make @@ -22,7 +22,7 @@ endif GAWK_VERSION = 3.1.4 GAWK = gawk-$(GAWK_VERSION) GAWK_SUFFIX = tar.gz -GAWK_URL = http://ftp.gnu.org/gnu/gawk/$(GAWK).$(GAWK_SUFFIX) +GAWK_URL = $(PTXCONF_GNUMIRROR)/gawk/$(GAWK).$(GAWK_SUFFIX) GAWK_SOURCE = $(SRCDIR)/$(GAWK).$(GAWK_SUFFIX) GAWK_DIR = $(BUILDDIR)/$(GAWK) diff --git a/rules/gcclibs.make b/rules/gcclibs.make index 8bb0f9814..425933314 100644 --- a/rules/gcclibs.make +++ b/rules/gcclibs.make @@ -3,6 +3,7 @@ # # Copyright (C) 2004 by Robert Schwebel # Marc Kleine-Budde <kleine-budde@gmx.de> +# 2005 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix # # See CREDITS for details about who has contributed to this project. # @@ -17,15 +18,14 @@ ifdef PTXCONF_GCCLIBS_GCC_S PACKAGES += gcclibs endif + # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- gcclibs_get: $(STATEDIR)/gcclibs.get -gcclibs_get_deps = $(GCCLIBS_SOURCE) - -$(STATEDIR)/gcclibs.get: $(gcclibs_get_deps) +$(STATEDIR)/gcclibs.get: @$(call targetinfo, $@) touch $@ @@ -47,12 +47,7 @@ $(STATEDIR)/gcclibs.extract: $(gcclibs_extract_deps) gcclibs_prepare: $(STATEDIR)/gcclibs.prepare -# -# dependencies -# -gcclibs_prepare_deps = $(STATEDIR)/gcclibs.extract -gcclibs_prepare_deps += $(STATEDIR)/virtual-xchain.install - +gcclibs_prepare_deps = $(STATEDIR)/gcclibs.extract $(STATEDIR)/gcclibs.prepare: $(gcclibs_prepare_deps) @$(call targetinfo, $@) @@ -91,15 +86,15 @@ gcclibs_targetinstall_deps = $(STATEDIR)/gcclibs.compile $(STATEDIR)/gcclibs.targetinstall: $(gcclibs_targetinstall_deps) @$(call targetinfo, $@) ifdef PTXCONF_GCCLIBS_CXX - @$(call copy_lib_root, libstdc++.so, /usr/lib) + @$(call copy_toolchain_lib_root, libstdc++.so, /usr/lib) endif ifdef PTXCONF_GCCLIBS_GCC_S - @$(call copy_lib_root, libgcc_s.so, /lib) + @$(call copy_toolchain_lib_root, libgcc_s.so, /lib) endif ifdef PTXCONF_GCCLIBS_GCC_S_NOF - @$(call copy_lib_root, libgcc_s_nof.so, /lib) + @$(call copy_toolchain_lib_root, libgcc_s_nof.so, /lib) endif touch $@ diff --git a/rules/gdb.make b/rules/gdb.make index 9c7fbfa08..5d042a5e0 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -23,7 +23,7 @@ endif GDB_VERSION = 6.3 GDB = gdb-$(GDB_VERSION) GDB_SUFFIX = tar.bz2 -GDB_URL = ftp://ftp.gnu.org/pub/gnu/gdb/$(GDB).$(GDB_SUFFIX) +GDB_URL = $(PTXCONF_GNUMIRROR)/gdb/$(GDB).$(GDB_SUFFIX) GDB_SOURCE = $(SRCDIR)/$(GDB).$(GDB_SUFFIX) GDB_DIR = $(BUILDDIR)/$(GDB) GDB_BUILDDIR = $(BUILDDIR)/$(GDB)-build diff --git a/rules/gettext.make b/rules/gettext.make index 17cd30cdf..1396dfdbc 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -23,7 +23,7 @@ endif GETTEXT_VERSION = 0.13 GETTEXT = gettext-$(GETTEXT_VERSION) GETTEXT_SUFFIX = tar.gz -GETTEXT_URL = ftp://ftp.gnu.org/pub/gnu/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) +GETTEXT_URL = $(PTXCONF_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) GETTEXT_SOURCE = $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX) GETTEXT_DIR = $(BUILDDIR)/$(GETTEXT) diff --git a/rules/glibc.in b/rules/glibc.in index 9c88410ec..b6646bd65 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -1,163 +1,99 @@ -config GLIBC_PTHREADS - bool - prompt "Compile glibc with pthreads" - default y - depends on GLIBC && LIBC - -config GLIBC_NPTL - bool - prompt "Compile glibc with NPTL" - depends on GLIBC_TLS && LIBC && !GLIBC_PTHREADS - -config GLIBC_TLS - bool - prompt "Compile glibc with TLS" - default n - depends on GLIBC && LIBC - -config GLIBC_LIBIO - bool - prompt "Build in GNU libio instead of GNU stdio" - default n - depends on GLIBC && LIBC - -config GLIBC_SHARED - bool - prompt "Build shared library" - default y - depends on GLIBC && LIBC - -config GLIBC_PROFILED - bool - prompt "Include profiling support" - default n - depends on GLIBC && LIBC - -config GLIBC_OMITFP - bool - prompt "Build undebuggable optimized library" - default n - depends on GLIBC && LIBC - -config GLIBC_BOUNDED - bool - prompt "Build with runtime bounds checking" - depends on GLIBC && LIBC - -config GLIBC_OPTKERNEL - bool - prompt "Optimize glibc for selected kernel version" - default n - depends on GLIBC && LIBC - config GLIBC_DEBUG bool "Don't strip debugging symbols" - depends on GLIBC && LIBC # ---------- comment "Install options" - depends on GLIBC && LIBC + +config GLIBC_PTHREAD + bool + prompt "Install libpthread on the target" config GLIBC_THREAD_DB bool prompt "Install libthread_db on the target" - depends on GLIBC && LIBC config GLIBC_LIBRT bool prompt "Install librt on the target" default n - depends on GLIBC && LIBC config GLIBC_DL bool prompt "Install libdl on the target" - depends on GLIBC && LIBC config GLIBC_CRYPT bool prompt "Install libcrypt on the target" - depends on GLIBC && LIBC config GLIBC_UTIL bool prompt "Install libutil on the target" - depends on GLIBC && LIBC config GLIBC_LIBM bool prompt "Install libm on the target" - depends on GLIBC && LIBC config GLIBC_NSS_DNS bool prompt "Install libnss_dns" - depends on GLIBC && LIBC select GLIBC_RESOLV config GLIBC_NSS_FILES bool prompt "Install libnss_files" - depends on GLIBC && LIBC config GLIBC_NSS_HESIOD bool prompt "Install libnss_hesiod" - depends on GLIBC && LIBC select GLIBC_RESOLV select GLIBC_NSS_FILES config GLIBC_NSS_NIS bool prompt "Install libnss_nis" - depends on GLIBC && LIBC select GLIBC_NSL select GLIBC_NSS_FILES config GLIBC_NSS_NISPLUS bool prompt "Install libnss_nisplus" - depends on GLIBC && LIBC select GLIBC_NSL config GLIBC_NSS_COMPAT bool prompt "Install libnss_compat" - depends on GLIBC && LIBC select GLIBC_NSL config GLIBC_RESOLV bool prompt "Install libresolv" - depends on GLIBC && LIBC config GLIBC_NSL bool prompt "Install libnsl" - depends on GLIBC && LIBC # ----- config GLIBC_GCONV bool prompt "Install gconv libraries" - depends on GLIBC && LIBC + depends on GLIBC config GLIBC_GCONV_ISO8859_1 bool prompt " ISO8859-1" - depends on GLIBC_GCONV && LIBC + depends on GLIBC_GCONV # ----- comment "Timezone Files" - depends on GLIBC && LIBC + depends on GLIBC config GLIBC_ZONEINFO bool prompt "Install zoneinfo files" - depends on GLIBC && LIBC + depends on GLIBC default N config GLIBC_ZONEINFO_AFRICA diff --git a/rules/glibc.make b/rules/glibc.make index f2c3ab9fc..558c12842 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -1,6 +1,7 @@ # -*-makefile-*- # $Id$ # +# Copyright (C) 2005 by Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix e.K., Hildesheim, Germany # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany # @@ -14,90 +15,11 @@ # We provide this package # ifdef PTXCONF_GLIBC -ifdef PTXCONF_LIBC PACKAGES += glibc endif -DYNAMIC_LINKER = /lib/ld-linux.so.2 -endif - -# -# Paths and names -# GLIBC = glibc-$(GLIBC_VERSION) -GLIBC_URL = ftp://ftp.gnu.org/gnu/glibc/$(GLIBC).tar.gz -GLIBC_SOURCE = $(SRCDIR)/$(GLIBC).tar.gz -GLIBC_DIR = $(BUILDDIR)/$(GLIBC) - -GLIBC_THREADS = glibc-linuxthreads-$(GLIBC_VERSION) -GLIBC_THREADS_URL = ftp://ftp.gnu.org/gnu/glibc/$(GLIBC_THREADS).tar.gz -GLIBC_THREADS_SOURCE = $(SRCDIR)/$(GLIBC_THREADS).tar.gz -GLIBC_THREADS_DIR = $(GLIBC_DIR) - -# We build off-tree and build zoneinfo files in a separate directory - -GLIBC_BUILDDIR = $(BUILDDIR)/$(GLIBC)-build -GLIBC_ZONEDIR = $(BUILDDIR)/$(GLIBC)-zoneinfo - -# -# Time Zone Files -# -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_AFRICA) += Africa -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ATLANTIC) += Atlantic -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EUROPE) += Europe -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EST5EDT) += EST5EDT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_CANADA) += Canada -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_FACTORY) += Factory -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_GMT0) += GMT0 -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ICELAND) += Iceland -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_JAPAN) += Japan -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_MST7MDT) += MST7MDT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_NAVAJO) += Navajo -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_WSU) += WSU -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_AMERICA) += America -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_AUSTRALIA) += Australia -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_CHILE) += Chile -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EGYPT) += Egypt -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_GB) += GB -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_INDIAN) += Indian -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_KWAJALEIN) += Kwajalein -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_MEXICO) += Mexico -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_PRC) += PRC -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ROC) += ROC -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_UCT) += UCT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_WET) += WET -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ANTARCTICA) += Antarctica -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_BRAZIL) += Brazil -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_CUBA) += Cuba -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EIRE) += Eire -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_IRAN) += Iran -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_LIBYA) += Libya -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_MIDEAST) += Mideast -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_PST8PDT) += PST8PDT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ROK) += ROK -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_US) += US -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ZULU) += Zulu -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ARCTIC) += Arctic -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_CET) += CET -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EET) += EET -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ETC) += Etc -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_GMT) += GMT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_HST) += HST -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ISRAEL) += Israel -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_MET) += MET -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_NZ) += NZ -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_PACIFIC) += Pacific -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_SINGAPORE) += Singapore -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_UTC) += UTC -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_ASIA) += Asia -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_CST6CDT) += CST6CDT -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_EST) += EST -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_HONGKONG) += Hongkong -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_JAMAICA) += Jameica -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_MST) += MST -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_NZ-CHAT) += NZ-Chat -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_SYSTEMV) += Sytemv -GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_UNIVERSAL) += Universal + # ---------------------------------------------------------------------------- # Get @@ -105,31 +27,10 @@ GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_UNIVERSAL) += Universal glibc_get: $(STATEDIR)/glibc.get -glibc_get_deps = $(GLIBC_SOURCE) - -ifdef PTXCONF_GLIBC_PTHREADS -glibc_get_deps += $(STATEDIR)/glibc-threads.get -endif - -glibc_threads_get_deps = $(GLIBC_THREADS_SOURCE) - -$(STATEDIR)/glibc.get: $(glibc_get_deps) +$(STATEDIR)/glibc.get: @$(call targetinfo, $@) - @$(call get_patches, $(GLIBC)) touch $@ -$(STATEDIR)/glibc-threads.get: $(glibc_threads_get_deps) - @$(call targetinfo, $@) - @$(call get_patches, $(GLIBC_THREADS)) - touch $@ - -$(GLIBC_SOURCE): - @$(call targetinfo, $@) - @$(call get, $(GLIBC_URL)) - -$(GLIBC_THREADS_SOURCE): - @$(call targetinfo, $@) - @$(call get, $(GLIBC_THREADS_URL)) # ---------------------------------------------------------------------------- # Extract @@ -137,124 +38,22 @@ $(GLIBC_THREADS_SOURCE): glibc_extract: $(STATEDIR)/glibc.extract -glibc_extract_deps = $(STATEDIR)/glibc-base.extract -ifdef PTXCONF_GLIBC_PTHREADS -glibc_extract_deps += $(STATEDIR)/glibc-threads.extract -endif +glibc_extract_deps = $(STATEDIR)/glibc.get $(STATEDIR)/glibc.extract: $(glibc_extract_deps) @$(call targetinfo, $@) touch $@ -$(STATEDIR)/glibc-base.extract: $(STATEDIR)/glibc.get - @$(call targetinfo, $@) - @$(call clean, $(GLIBC_DIR)) - @$(call extract, $(GLIBC_SOURCE)) - @$(call patchin, $(GLIBC)) - touch $@ - -$(STATEDIR)/glibc-threads.extract: $(STATEDIR)/glibc.get - @$(call targetinfo, $@) - @$(call extract, $(GLIBC_THREADS_SOURCE), $(GLIBC_DIR)) - @$(call patchin, $(GLIBC_THREADS), $(GLIBC_DIR)) - touch $@ - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- glibc_prepare: $(STATEDIR)/glibc.prepare -glibc_prepare_deps = $(STATEDIR)/autoconf213.install -glibc_prepare_deps += $(STATEDIR)/glibc.extract -glibc_prepare_deps += $(STATEDIR)/xchain-kernel.install - -GLIBC_AUTOCONF = $(CROSS_AUTOCONF) -GLIBC_AUTOCONF += --with-headers=$(CROSS_LIB_DIR)/include -GLIBC_AUTOCONF += --enable-clocale=gnu -GLIBC_AUTOCONF += --without-cvs -GLIBC_AUTOCONF += --without-gd -GLIBC_AUTOCONF += --prefix=/usr -GLIBC_AUTOCONF += --libexecdir=/usr/bin - -ifdef PTXCONF_GLIBC_OPTKERNEL -GLIBC_AUTOCONF += --enable-kernel=$(KERNEL_VERSION) -endif - -ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.2) -GLIBC_PATH = PATH=$(call remove_quotes,$(PTXCONF_PREFIX))/$(call remove_quotes,$(AUTOCONF213))/bin:$(CROSS_PATH) -else -#FIXME: wich autoconf version wants the glibc 2.3.x? -GLIBC_PATH = PATH=$(CROSS_PATH) -endif - -GLIBC_ENV = $(CROSS_ENV) BUILD_CC=$(HOSTCC) - -# -# features -# -ifdef PTXCONF_GLIBC_LIBIO -GLIBC_AUTOCONF += --enable-libio -endif - -ifdef PTXCONF_GLIBC_SHARED -GLIBC_AUTOCONF += --enable-shared -else -GLIBC_AUTOCONF += --enable-shared=no -endif - -ifdef PTXCONF_GLIBC_PROFILED -GLIBC_AUTOCONF += --enable-profile=yes -else -GLIBC_AUTOCONF += --enable-profile=no -endif - -ifdef PTXCONF_GLIBC_OMITFP -GLIBC_AUTOCONF += --enable-omitfp -endif - -ifdef PTXCONF_GLIBC_PTHREADS -GLIBC_AUTOCONF += --enable-add-ons=linuxthreads -endif - -ifdef PTXCONF_GLIBC_NPTL -GLIBC_AUTOCONF += --enable-add-ons=nptl -endif - -ifdef PTXCONF_GLIBC_TLS -GLIBC_AUTOCONF += --with-tls -else -GLIBC_AUTOCONF += --without-tls -endif - -# from config/arch/*.dat: -# additional architecture dependend configure options - -GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG) +glibc_prepare_deps = $(STATEDIR)/glibc.extract $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps) @$(call targetinfo, $@) - - # Let's build off-tree - mkdir -p $(GLIBC_BUILDDIR) - cd $(GLIBC_BUILDDIR) && \ - $(GLIBC_PATH) $(GLIBC_ENV) \ - $(GLIBC_DIR)/configure $(GLIBC_AUTOCONF) - -# $(call remove_quotes,$(PTXCONF_GNU_TARGET)) \ - - # # FIXME: RSC: this crashed because it wants to run elf/sln - # # don't compile programs - # echo "build-programs=no" >> $(GLIBC_BUILDDIR)/configparms - - # Zoneinfo files are not created when being cross compiled :-( - # So we configure a new tree, but without cross... - # FIXME: check if this has endianess issues. - - cp -a $(GLIBC_DIR)/timezone $(GLIBC_ZONEDIR) - perl -i -p -e "s,include \.\.\/Makeconfig.*,# include\.\.\/Makeconfig,g" $(GLIBC_ZONEDIR)/Makefile - perl -i -p -e "s,include \.\.\/Rules,# include \.\.\/Rules,g" $(GLIBC_ZONEDIR)/Makefile - touch $@ # ---------------------------------------------------------------------------- @@ -263,26 +62,10 @@ $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps) glibc_compile: $(STATEDIR)/glibc.compile -$(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare - @$(call targetinfo, $@) - - # some tools have to be built for host, not for target! - cd $(GLIBC_ZONEDIR) && CC=$(HOSTCC) make zic - - # Now the "normal" build; override some programs which are being - # run during compile time to avoid glibc runs cross compiled - # binaries - #cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make \ - # rpcgen_FOR_BUILD=rpcgen \ - # zic_FOR_BUILD=$(GLIBC_ZONEDIR)/timezone/zic \ - - cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make - - # fake files which are installed by make install although - # compiling binaries was switched of (tested with 2.2.5) - #touch $(GLIBC_BUILDDIR)/iconv/iconv_prog - #touch $(GLIBC_BUILDDIR)/login/pt_chown +glibc_compile_deps = $(STATEDIR)/glibc.prepare +$(STATEDIR)/glibc.compile: $(glibc_compile_deps) + @$(call targetinfo, $@) touch $@ # ---------------------------------------------------------------------------- @@ -291,53 +74,10 @@ $(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare glibc_install: $(STATEDIR)/glibc.install -$(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile - @$(call targetinfo, $@) - +glibc_install_deps = $(STATEDIR)/glibc.compile - # Install as usual - cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make \ - install_root=$(CROSS_LIB_DIR) \ - prefix="" \ - zic_FOR_BUILD=$(GLIBC_BUILDDIR)/timezone/zic \ - 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 - -ifdef PTXCONF_GLIBC_ZONEINFO - ( cd $(GLIBC_ZONEDIR) && \ - for file in `find . -name "z.*" | sed -e "s,.*z.\(.*\),\1,g"`; do \ - ./zic -d zoneinfo $$file || echo "failed [$$FILE]"; \ - done \ - ) -endif +$(STATEDIR)/glibc.install: $(glibc_install_deps) + @$(call targetinfo, $@) touch $@ # ---------------------------------------------------------------------------- @@ -349,125 +89,90 @@ glibc_targetinstall: $(STATEDIR)/glibc.targetinstall glibc_targetinstall_deps = $(STATEDIR)/glibc.install ifdef PTXCONF_GLIBC_DEBUG -GLIBC_STRIP = true +GLIBC_STRIP = n else -GLIBC_STRIP = $(CROSSSTRIP) -R .note -R .comment +GLIBC_STRIP = y endif $(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps) @$(call targetinfo, $@) - # FIXME: use our root install macros here + @$(call copy_toolchain_dl_root, /lib, $(GLIBC_STRIP)) - # CAREFUL: don't never ever make install!!! - # but we never ever run ptxdist as root, do we? :) - mkdir -p $(ROOTDIR)/lib + @$(call copy_toolchain_lib_root, libc.so, /lib, $(GLIBC_STRIP)) - cp -d $(CROSS_LIB_DIR)/lib/ld[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/ld[-.]*so* - cd $(CROSS_LIB_DIR)/lib && \ - ln -sf ld-$(GLIBC_VERSION).so $(ROOTDIR)$(DYNAMIC_LINKER) - - # we don't wanna copy libc.so, cause this is a ld linker script, - # no shared lib - cp -d $(CROSS_LIB_DIR)/lib/libc-*so* $(ROOTDIR)/lib/ - cp -d $(CROSS_LIB_DIR)/lib/libc.so.* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libc[-.]*so* - - # copy librt -ifdef PTXCONF_GLIBC_LIBRT - cp -d $(CROSS_LIB_DIR)/lib/librt[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/librt[-.]*so* +ifdef PTXCONF_GLIBC_PTHREAD + @$(call copy_toolchain_lib_root, libpthread.so, /lib, $(GLIBC_STRIP)) endif - # we don't wanna copy libpthread.so, cause this may be a - # ld linker script, no shared lib - -ifdef PTXCONF_GLIBC_PTHREADS - cp -d $(CROSS_LIB_DIR)/lib/libpthread-*so* $(ROOTDIR)/lib/ - cp -d $(CROSS_LIB_DIR)/lib/libpthread.so.* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libpthread[-.]*so* - cd $(CROSS_LIB_DIR)/lib && \ - ln -sf libpthread.so.* $(ROOTDIR)/lib/libpthread.so +ifdef PTXCONF_GLIBC_THREAD_DB + @$(call copy_toolchain_lib_root, libthread_db.so, /lib, $(GLIBC_STRIP)) endif -ifdef PTXCONF_GLIBC_THREAD_DB - cp -d $(CROSS_LIB_DIR)/lib/libthread_db[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libthread_db[-.]*so* +ifdef PTXCONF_GLIBC_LIBRT + @$(call copy_toolchain_lib_root, librt.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_DL - cp -d $(CROSS_LIB_DIR)/lib/libdl[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libdl[-.]*so* + @$(call copy_toolchain_lib_root, libdl.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_CRYPT - cp -d $(CROSS_LIB_DIR)/lib/libcrypt[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libcrypt[-.]*so* + @$(call copy_toolchain_lib_root, libcrypt.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_UTIL - cp -d $(CROSS_LIB_DIR)/lib/libutil[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libutil[-.]*so* + @$(call copy_toolchain_lib_root, libutil.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_LIBM - cp -d $(CROSS_LIB_DIR)/lib/libm[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libm[-.]*so* + @$(call copy_toolchain_lib_root, libm.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_DNS - cp -d $(CROSS_LIB_DIR)/lib/libnss_dns[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_dns[-.]*so* + @$(call copy_toolchain_lib_root, libnss_dns.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_FILES - cp -d $(CROSS_LIB_DIR)/lib/libnss_files[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_files[-.]*so* + @$(call copy_toolchain_lib_root, libnss_files.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_HESIOD - cp -d $(CROSS_LIB_DIR)/lib/libnss_hesiod[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_hesiod[-.]*so* + @$(call copy_toolchain_lib_root, libnss_hesiod.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_NIS - cp -d $(CROSS_LIB_DIR)/lib/libnss_nis[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nis[-.]*so* + @$(call copy_toolchain_lib_root, libnss_nis.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_NISPLUS - cp -d $(CROSS_LIB_DIR)/lib/libnss_nisplus[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nisplus[-.]*so* + @$(call copy_toolchain_lib_root, libnss_nisplus.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_COMPAT - cp -d $(CROSS_LIB_DIR)/lib/libnss_compat[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_compat[-.]*so* + @$(call copy_toolchain_lib_root, libnss_compat.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_RESOLV - cp -d $(CROSS_LIB_DIR)/lib/libresolv[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libresolv[-.]*so* + @$(call copy_toolchain_lib_root, libresolv.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSL - cp -d $(CROSS_LIB_DIR)/lib/libnsl[-.]*so* $(ROOTDIR)/lib/ - $(GLIBC_STRIP) $(ROOTDIR)/lib/libnsl[-.]*so* + @$(call copy_toolchain_lib_root, libnsl.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_GCONV install -d $(ROOTDIR)/usr/lib/gconv rm -f $(ROOTDIR)/usr/lib/gconv/gconv-modules +endif ifdef PTXCONF_GLIBC_GCONV_ISO8859_1 - cp $(GLIBC_BUILDDIR)/iconvdata/ISO8859-1.so $(ROOTDIR)/usr/lib/gconv/ + @$(call copy_toolchain_lib_root, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP)) echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \ >> $(ROOTDIR)/usr/lib/gconv/gconv-modules endif -endif - # Zonefiles +# Zonefiles $(call copy_root, 0, 0, 0755, /usr/share/zoneinfo) for target in $(GLIBC_ZONEFILES-y); do \ cp -a $(GLIBC_ZONEDIR)/zoneinfo/$$target $(ROOTDIR)/usr/share/zoneinfo/; \ @@ -481,8 +186,5 @@ endif glibc_clean: -rm -rf $(STATEDIR)/glibc* - -rm -rf $(GLIBC_DIR) - -rm -rf $(GLIBC_BUILDDIR) - -rm -rf $(GLIBC_ZONEDIR) # vim: syntax=make diff --git a/rules/gmp3.make b/rules/gmp3.make index 8ac795a12..2bae12e4a 100644 --- a/rules/gmp3.make +++ b/rules/gmp3.make @@ -14,7 +14,7 @@ GMP3_VERSION = 3.1.1 GMP3 = gmp-$(GMP3_VERSION) GMP3_SUFFIX = tar.gz -GMP3_URL = ftp://ftp.gnu.org/gnu/gmp/$(GMP3).$(GMP3_SUFFIX) +GMP3_URL = $(PTXCONF_GNUMIRROR)/gmp/$(GMP3).$(GMP3_SUFFIX) GMP3_SOURCE = $(SRCDIR)/$(GMP3).$(GMP3_SUFFIX) GMP3_DIR = $(BUILDDIR)/$(GMP3) diff --git a/rules/hosttool-e2fsprogs.make b/rules/hosttool-e2fsprogs.make index 981484e6d..e2f98cea4 100644 --- a/rules/hosttool-e2fsprogs.make +++ b/rules/hosttool-e2fsprogs.make @@ -22,7 +22,7 @@ endif HOSTTOOLS_E2FSPROGS_VERSION = 1.35 HOSTTOOLS_E2FSPROGS = e2fsprogs-$(HOSTTOOLS_E2FSPROGS_VERSION) HOSTTOOLS_E2FSPROGS_SUFFIX = tar.gz -HOSTTOOLS_E2FSPROGS_URL = http://switch.dl.sourceforge.net/sourceforge/e2fsprogs/$(HOSTTOOLS_E2FSPROGS).$(HOSTTOOLS_E2FSPROGS_SUFFIX) +HOSTTOOLS_E2FSPROGS_URL = $(PTXCONF_SFMIRROR)/e2fsprogs/$(HOSTTOOLS_E2FSPROGS).$(HOSTTOOLS_E2FSPROGS_SUFFIX) HOSTTOOLS_E2FSPROGS_SOURCE_DIR = $(SRCDIR)/hosttool/ HOSTTOOLS_E2FSPROGS_SOURCE = $(HOSTTOOLS_E2FSPROGS_SOURCE_DIR)/$(HOSTTOOLS_E2FSPROGS).$(HOSTTOOLS_E2FSPROGS_SUFFIX) HOSTTOOLS_E2FSPROGS_DIR = $(BUILDDIR)/hosttool/$(HOSTTOOLS_E2FSPROGS) diff --git a/rules/hosttool-fakeroot.make b/rules/hosttool-fakeroot.make index 310bef993..39c99cca1 100644 --- a/rules/hosttool-fakeroot.make +++ b/rules/hosttool-fakeroot.make @@ -19,10 +19,10 @@ endif # # Paths and names # -HOSTTOOLS_FAKEROOT_VERSION = 1.2.4 +HOSTTOOLS_FAKEROOT_VERSION = 1.2.5 HOSTTOOLS_FAKEROOT = fakeroot-$(HOSTTOOLS_FAKEROOT_VERSION) HOSTTOOLS_FAKEROOT_SUFFIX = tar.gz -HOSTTOOLS_FAKEROOT_URL = $(PTXCONF_DEBPOOLM)/pool/main/f/fakeroot/fakeroot_$(HOSTTOOLS_FAKEROOT_VERSION).$(HOSTTOOLS_FAKEROOT_SUFFIX) +HOSTTOOLS_FAKEROOT_URL = $(PTXCONF_DEBMIRROR)/pool/main/f/fakeroot/fakeroot_$(HOSTTOOLS_FAKEROOT_VERSION).$(HOSTTOOLS_FAKEROOT_SUFFIX) HOSTTOOLS_FAKEROOT_SOURCE = $(SRCDIR)/fakeroot_$(HOSTTOOLS_FAKEROOT_VERSION).$(HOSTTOOLS_FAKEROOT_SUFFIX) HOSTTOOLS_FAKEROOT_DIR = $(HOSTTOOLS_BUILDDIR)/$(HOSTTOOLS_FAKEROOT) @@ -78,8 +78,8 @@ HOSTTOOLS_FAKEROOT_ENV = $(HOSTCC_ENV) HOSTTOOLS_FAKEROOT_AUTOCONF = \ --prefix=$(PTXCONF_PREFIX) \ --build=$(GNU_HOST) - --host=$(GNU_HOST) - --target=$(GNU_HOST) + --host=$(GNU_HOST) + --target=$(GNU_HOST) $(STATEDIR)/hosttool-fakeroot.prepare: $(hosttool-fakeroot_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/hosttool-genext2fs.make b/rules/hosttool-genext2fs.make index 36fbec131..b21f31536 100644 --- a/rules/hosttool-genext2fs.make +++ b/rules/hosttool-genext2fs.make @@ -23,7 +23,7 @@ HOSTTOOLS_GENEXT2FS_VERSION = 1.3.orig HOSTTOOLS_GENEXT2FS = genext2fs-$(HOSTTOOLS_GENEXT2FS_VERSION) HOSTTOOLS_GENEXT2FS_TARBALL = genext2fs_$(HOSTTOOLS_GENEXT2FS_VERSION).$(HOSTTOOLS_GENEXT2FS_SUFFIX) HOSTTOOLS_GENEXT2FS_SUFFIX = tar.gz -HOSTTOOLS_GENEXT2FS_URL = $(PTXCONF_DEBPOOLM)/pool/main/g/genext2fs/$(HOSTTOOLS_GENEXT2FS_TARBALL) +HOSTTOOLS_GENEXT2FS_URL = $(PTXCONF_DEBMIRROR)/pool/main/g/genext2fs/$(HOSTTOOLS_GENEXT2FS_TARBALL) HOSTTOOLS_GENEXT2FS_SOURCE = $(SRCDIR)/$(HOSTTOOLS_GENEXT2FS_TARBALL) HOSTTOOLS_GENEXT2FS_DIR = $(BUILDDIR)/$(HOSTTOOLS_GENEXT2FS) diff --git a/rules/hotplug.make b/rules/hotplug.make index 142470bda..c79d5e16d 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -22,7 +22,7 @@ endif HOTPLUG_VERSION = 2004_03_29 HOTPLUG = hotplug-$(HOTPLUG_VERSION) HOTPLUG_SUFFIX = tar.gz -HOTPLUG_URL = http://puzzle.dl.sourceforge.net/sourceforge/linux-hotplug/$(HOTPLUG).$(HOTPLUG_SUFFIX) +HOTPLUG_URL = $(PTXCONF_SFMIRROR)/linux-hotplug/$(HOTPLUG).$(HOTPLUG_SUFFIX) HOTPLUG_SOURCE = $(SRCDIR)/$(HOTPLUG).$(HOTPLUG_SUFFIX) HOTPLUG_DIR = $(BUILDDIR)/$(HOTPLUG) diff --git a/rules/inetutils.make b/rules/inetutils.make index 53ea6f08a..990e6ef77 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -22,7 +22,7 @@ endif INETUTILS_VERSION = 1.4.2 INETUTILS = inetutils-$(INETUTILS_VERSION) INETUTILS_SUFFIX = tar.gz -INETUTILS_URL = ftp://ftp.gnu.org/gnu/inetutils/$(INETUTILS).$(INETUTILS_SUFFIX) +INETUTILS_URL = $(PTXCONF_GNUMIRROR)/inetutils/$(INETUTILS).$(INETUTILS_SUFFIX) INETUTILS_SOURCE = $(SRCDIR)/$(INETUTILS).$(INETUTILS_SUFFIX) INETUTILS_DIR = $(BUILDDIR)/$(INETUTILS) diff --git a/rules/libc.in b/rules/libc.in index d81ff0669..09935e2b6 100644 --- a/rules/libc.in +++ b/rules/libc.in @@ -4,11 +4,6 @@ menu "C Library " -config LIBC - bool - prompt "Compile a C Library" - default y - choice prompt "Which C library do you want to use?" default GLIBC @@ -76,8 +71,11 @@ choice endchoice +if GLIBC source "rules/glibc.in" +endif +if UCLIBC source "rules/uclibc.in" - +endif endmenu diff --git a/rules/libpng125.make b/rules/libpng125.make index eddcdbeab..94964830a 100644 --- a/rules/libpng125.make +++ b/rules/libpng125.make @@ -23,7 +23,7 @@ endif LIBPNG125_VERSION = 1.2.5 LIBPNG125 = libpng-$(LIBPNG125_VERSION) LIBPNG125_SUFFIX = tar.gz -LIBPNG125_URL = http://download.sourceforge.net/libpng/$(LIBPNG125).$(LIBPNG125_SUFFIX) +LIBPNG125_URL = $(PTXCONF_SFMIRROR)/libpng/$(LIBPNG125).$(LIBPNG125_SUFFIX) LIBPNG125_SOURCE = $(SRCDIR)/$(LIBPNG125).$(LIBPNG125_SUFFIX) LIBPNG125_DIR = $(BUILDDIR)/$(LIBPNG125) diff --git a/rules/mii-diag.make b/rules/mii-diag.make index 789df7a30..84f544d6f 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -22,7 +22,7 @@ endif MII-DIAG_VERSION = 2.09 MII-DIAG = mii-diag-$(MII-DIAG_VERSION).orig MII-DIAG_SUFFIX = tar.gz -MII-DIAG_URL = $(PTXCONF_DEBPOOLM)/pool/main/m/mii-diag/mii-diag_$(MII-DIAG_VERSION).orig.$(MII-DIAG_SUFFIX) +MII-DIAG_URL = $(PTXCONF_DEBMIRROR)/pool/main/m/mii-diag/mii-diag_$(MII-DIAG_VERSION).orig.$(MII-DIAG_SUFFIX) MII-DIAG_SOURCE = $(SRCDIR)/mii-diag_$(MII-DIAG_VERSION).orig.$(MII-DIAG_SUFFIX) MII-DIAG_DIR = $(BUILDDIR)/$(MII-DIAG) diff --git a/rules/ncurses.make b/rules/ncurses.make index a51b8b60f..494f0564a 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -21,7 +21,7 @@ endif NCURSES_VERSION = 5.3 NCURSES = ncurses-$(NCURSES_VERSION) NCURSES_SUFFIX = tar.gz -NCURSES_URL = ftp://ftp.gnu.org/pub/gnu/ncurses/$(NCURSES).$(NCURSES_SUFFIX) +NCURSES_URL = $(PTXCONF_GNUMIRROR)/ncurses/$(NCURSES).$(NCURSES_SUFFIX) NCURSES_SOURCE = $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX) NCURSES_DIR = $(BUILDDIR)/$(NCURSES) diff --git a/rules/omniorb.make b/rules/omniorb.make index a8cf2de30..a5eec19f0 100644 --- a/rules/omniorb.make +++ b/rules/omniorb.make @@ -1,3 +1,4 @@ +# -*-makefile-*- # $Id: template 2078 2004-12-01 15:28:17Z rsc $ # # Copyright (C) 2005 by Robert Schwebel @@ -21,7 +22,7 @@ endif OMNIORB_VERSION = 4.0.5 OMNIORB = omniORB-$(OMNIORB_VERSION) OMNIORB_SUFFIX = tar.gz -OMNIORB_URL = http://mesh.dl.sourceforge.net/sourceforge/omniorb/$(OMNIORB).$(OMNIORB_SUFFIX) +OMNIORB_URL = $(PTXCONF_SFMIRROR)/omniorb/$(OMNIORB).$(OMNIORB_SUFFIX) OMNIORB_SOURCE = $(SRCDIR)/$(OMNIORB).$(OMNIORB_SUFFIX) OMNIORB_DIR = $(BUILDDIR)/$(OMNIORB) diff --git a/rules/oprofile.make b/rules/oprofile.make index 0bda07c04..ac95b7a62 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -22,7 +22,7 @@ endif OPROFILE_VERSION = 0.8 OPROFILE = oprofile-$(OPROFILE_VERSION) OPROFILE_SUFFIX = tar.gz -OPROFILE_URL = ftp://ftp.sourceforge.net/pub/sourceforge/oprofile/$(OPROFILE).$(OPROFILE_SUFFIX) +OPROFILE_URL = $(PTXCONF_SFMIRROR)/oprofile/$(OPROFILE).$(OPROFILE_SUFFIX) OPROFILE_SOURCE = $(SRCDIR)/$(OPROFILE).$(OPROFILE_SUFFIX) OPROFILE_DIR = $(BUILDDIR)/$(OPROFILE) diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make index ca2e605f8..200878f34 100644 --- a/rules/pcmcia-cs.make +++ b/rules/pcmcia-cs.make @@ -22,7 +22,7 @@ endif PCMCIA-CS_VERSION = 3.2.5 PCMCIA-CS = pcmcia-cs-$(PCMCIA-CS_VERSION) PCMCIA-CS_SUFFIX = tar.gz -PCMCIA-CS_URL = http://pcmcia-cs.sourceforge.net/ftp/$(PCMCIA-CS).$(PCMCIA-CS_SUFFIX) +PCMCIA-CS_URL = $(PTXCONF_SFMIRROR)/pcmcia-cs/$(PCMCIA-CS).$(PCMCIA-CS_SUFFIX) PCMCIA-CS_SOURCE = $(SRCDIR)/$(PCMCIA-CS).$(PCMCIA-CS_SUFFIX) PCMCIA-CS_DIR = $(BUILDDIR)/$(PCMCIA-CS) diff --git a/rules/pop3spam.make b/rules/pop3spam.make index eff8af9ec..462bd057b 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -1,4 +1,4 @@ -# +# -*-makefile-*- # $Id$ # # Copyright (C) 2004 by Robert Schwebel @@ -22,7 +22,7 @@ endif POP3SPAM_VERSION = 0.9 POP3SPAM = pop3spam-$(POP3SPAM_VERSION) POP3SPAM_SUFFIX = tar.bz2 -POP3SPAM_URL = http://pop3spam.sourceforge.net/files/$(POP3SPAM).$(POP3SPAM_SUFFIX) +POP3SPAM_URL = $(PTXCONF_SFMIRROR)/pop3spam/$(POP3SPAM).$(POP3SPAM_SUFFIX) POP3SPAM_SOURCE = $(SRCDIR)/$(POP3SPAM).$(POP3SPAM_SUFFIX) POP3SPAM_DIR = $(BUILDDIR)/$(POP3SPAM) diff --git a/rules/ptxdistopts.in b/rules/ptxdistopts.in index e662d28de..a73b7ee37 100644 --- a/rules/ptxdistopts.in +++ b/rules/ptxdistopts.in @@ -1,11 +1,21 @@ menu "PTXdist Options " -config DEBPOOLM +config DEBMIRROR string - default "http://ftp.se.debian.org/debian/" - prompt "Debian Pool Mirror " + default "http://ftp.de.debian.org/debian" + prompt "Debian Pool Mirror" help The Debian pool mirror to use for downloading various components of the target root filesystem. +config SFMIRROR + string + default "http://mesh.dl.sourceforge.net/sourceforge" + prompt "Sourceforge Mirror" + +config GNUMIRROR + string + default "ftp://ftp.informatik.rwth-aachen.de/pub/gnu" + prompt "GNU.org Mirror" + endmenu diff --git a/rules/readline.make b/rules/readline.make index 2a2d87ac5..e20bc7a94 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -22,7 +22,7 @@ endif READLINE_VERSION = 5.0 READLINE = readline-$(READLINE_VERSION) READLINE_SUFFIX = tar.gz -READLINE_URL = http://ftp.gnu.org/pub/gnu/readline//$(READLINE).$(READLINE_SUFFIX) +READLINE_URL = $(PTXCONF_GNUMIRROR)/readline/$(READLINE).$(READLINE_SUFFIX) READLINE_SOURCE = $(SRCDIR)/$(READLINE).$(READLINE_SUFFIX) READLINE_DIR = $(BUILDDIR)/$(READLINE) diff --git a/rules/setmixer.make b/rules/setmixer.make index 36f5a2457..1ced54fa7 100644 --- a/rules/setmixer.make +++ b/rules/setmixer.make @@ -21,7 +21,7 @@ endif # SETMIXER = setmixer_27DEC94.orig SETMIXER_SUFFIX = tar.gz -SETMIXER_URL = $(PTXCONF_DEBPOOLM)/pool/main/s/setmixer/$(SETMIXER).$(SETMIXER_SUFFIX) +SETMIXER_URL = $(PTXCONF_DEBMIRROR)/pool/main/s/setmixer/$(SETMIXER).$(SETMIXER_SUFFIX) SETMIXER_SOURCE = $(SRCDIR)/$(SETMIXER).$(SETMIXER_SUFFIX) SETMIXER_DIR = $(BUILDDIR)/setmixer-27DEC94.orig diff --git a/rules/strace.make b/rules/strace.make index 21f9c8768..e87b4fc2d 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -20,7 +20,7 @@ endif # Paths and names # STRACE = strace-4.5.7 -STRACE_URL = http://umn.dl.sourceforge.net/sourceforge/strace/$(STRACE).tar.bz2 +STRACE_URL = $(PTXCONF_SFMIRROR)/strace/$(STRACE).tar.bz2 STRACE_SOURCE = $(SRCDIR)/$(STRACE).tar.bz2 STRACE_DIR = $(BUILDDIR)/$(STRACE) diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index a0002ac14..c9935865b 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -22,7 +22,7 @@ endif SYSFSUTILS_VERSION = 1.2.0 SYSFSUTILS = sysfsutils-$(SYSFSUTILS_VERSION) SYSFSUTILS_SUFFIX = tar.gz -SYSFSUTILS_URL = http://heanet.dl.sourceforge.net/sourceforge/linux-diag/$(SYSFSUTILS).$(SYSFSUTILS_SUFFIX) +SYSFSUTILS_URL = $(PTXCONF_SFMIRROR)/linux-diag/$(SYSFSUTILS).$(SYSFSUTILS_SUFFIX) SYSFSUTILS_SOURCE = $(SRCDIR)/$(SYSFSUTILS).$(SYSFSUTILS_SUFFIX) SYSFSUTILS_DIR = $(BUILDDIR)/$(SYSFSUTILS) diff --git a/rules/sysutils.make b/rules/sysutils.make index 9b8354c32..2e4d64aaf 100644 --- a/rules/sysutils.make +++ b/rules/sysutils.make @@ -22,7 +22,7 @@ endif SYSUTILS_VERSION = 0.1.0 SYSUTILS = sysutils-$(SYSUTILS_VERSION) SYSUTILS_SUFFIX = tar.gz -SYSUTILS_URL = http://kernel.org/pub/linux/utils/kernel/hotplug/$(SYSUTILS).$(SYSUTILS_SUFFIX) +SYSUTILS_URL = http://www.de.kernel.org/pub/linux/utils/kernel/hotplug/$(SYSUTILS).$(SYSUTILS_SUFFIX) SYSUTILS_SOURCE = $(SRCDIR)/$(SYSUTILS).$(SYSUTILS_SUFFIX) SYSUTILS_DIR = $(BUILDDIR)/$(SYSUTILS) diff --git a/rules/termcap.make b/rules/termcap.make index a57cee03a..3a687a1f7 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -22,7 +22,7 @@ endif TERMCAP_VERSION = 1.3.1 TERMCAP = termcap-$(TERMCAP_VERSION) TERMCAP_SUFFIX = tar.gz -TERMCAP_URL = ftp://ftp.gnu.org/pub/gnu/termcap/$(TERMCAP).$(TERMCAP_SUFFIX) +TERMCAP_URL = $(PTXCONF_GNUMIRROR)/termcap/$(TERMCAP).$(TERMCAP_SUFFIX) TERMCAP_SOURCE = $(SRCDIR)/$(TERMCAP).$(TERMCAP_SUFFIX) TERMCAP_DIR = $(BUILDDIR)/$(TERMCAP) diff --git a/rules/uclibc.in b/rules/uclibc.in index 9c1f4f61f..e28f528b2 100644 --- a/rules/uclibc.in +++ b/rules/uclibc.in @@ -1,40 +1,31 @@ - source "config/uClibc-0.9.27/extra/Configs/Config.in" comment "Install options" - depends on UCLIBC config UCLIBC_CRYPT bool prompt "Install libcrypt on the target" - depends on UCLIBC config UCLIBC_DL bool prompt "Install libdl on the target" - depends on UCLIBC config UCLIBC_M bool prompt "Install libm on the target" - depends on UCLIBC config UCLIBC_NSL bool prompt "Install libnsl on the target" - depends on UCLIBC config UCLIBC_PTHREAD bool prompt "Install libpthread on the target" - depends on UCLIBC config UCLIBC_RESOLV bool prompt "Install libresolv on the target" - depends on UCLIBC config UCLIBC_UTIL bool prompt "Install libutil on the target" - depends on UCLIBC diff --git a/rules/wxWindows.make b/rules/wxWindows.make index bc82707cd..75c8dd728 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -22,7 +22,7 @@ endif WXWINDOWS_VERSION = 2.4.2 WXWINDOWS = wxX11-$(WXWINDOWS_VERSION) WXWINDOWS_SUFFIX = tar.gz -WXWINDOWS_URL = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/$(WXWINDOWS).$(WXWINDOWS_SUFFIX) +WXWINDOWS_URL = $(PTXCONF_SFMIRROR)/wxwindows/$(WXWINDOWS).$(WXWINDOWS_SUFFIX) WXWINDOWS_SOURCE = $(SRCDIR)/$(WXWINDOWS).$(WXWINDOWS_SUFFIX) WXWINDOWS_DIR = $(BUILDDIR)/$(WXWINDOWS) diff --git a/rules/xchain-flex254.make b/rules/xchain-flex254.make index 006b9cce3..104813dba 100644 --- a/rules/xchain-flex254.make +++ b/rules/xchain-flex254.make @@ -23,7 +23,7 @@ XCHAIN_FLEX254_VERSION = 2.5.4 XCHAIN_FLEX254 = flex-$(XCHAIN_FLEX254_VERSION) XCHAIN_FLEX254_TARBALL = flex-$(XCHAIN_FLEX254_VERSION)a.$(XCHAIN_FLEX254_SUFFIX) XCHAIN_FLEX254_SUFFIX = tar.gz -XCHAIN_FLEX254_URL = ftp://ftp.gnu.org/pub/gnu/non-gnu/flex/$(XCHAIN_FLEX254_TARBALL) +XCHAIN_FLEX254_URL = $(PTXCONF_GNUMIRROR)/non-gnu/flex/$(XCHAIN_FLEX254_TARBALL) XCHAIN_FLEX254_SOURCE = $(SRCDIR)/$(XCHAIN_FLEX254_TARBALL) XCHAIN_FLEX254_DIR = $(XCHAIN_BUILDDIR)/$(XCHAIN_FLEX254) diff --git a/rules/xchain-glibc.make b/rules/xchain-glibc.make deleted file mode 100644 index c2c6b8726..000000000 --- a/rules/xchain-glibc.make +++ /dev/null @@ -1,153 +0,0 @@ -# -*-makefile-*- -# $Id$ -# -# 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 -# see the README file. -# - -# -# We provide this package -# -# ifdef PTXCONF_GLIBC -# XCHAIN += xchain-glibc -# endif - -XCHAIN_GLIBC_BUILDDIR = $(BUILDDIR)/xchain-$(GLIBC)-build - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -xchain-glibc_get: $(STATEDIR)/xchain-glibc.get - -xchain-glibc_get_deps = \ - $(glibc_get_deps) - -$(STATEDIR)/xchain-glibc.get: $(xchain-glibc_get_deps) - @$(call targetinfo, $@) - touch $@ - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -xchain-glibc_extract: $(STATEDIR)/xchain-glibc.extract - -$(STATEDIR)/xchain-glibc.extract: $(glibc_extract_deps) - @$(call targetinfo, $@) - touch $@ - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -xchain-glibc_prepare: $(STATEDIR)/xchain-glibc.prepare - -xchain-glibc_prepare_deps = \ - $(STATEDIR)/xchain-binutils.install \ - $(STATEDIR)/xchain-glibc.extract - -XCHAIN_GLIBC_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --with-header=$(CROSS_LIB_DIR)/include \ - --without-cvs \ - --disable-sanity-checks \ - --enable-hacker-mode - -XCHAIN_GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG) - -XCHAIN_GLIBC_ENV = CC=$(HOSTCC) - -$(STATEDIR)/xchain-glibc.prepare: $(xchain-glibc_prepare_deps) - @$(call targetinfo, $@) - @$(call clean, $(XCHAIN_GLIBC_BUILDDIR)) - mkdir -p $(XCHAIN_GLIBC_BUILDDIR) - cd $(XCHAIN_GLIBC_BUILDDIR) && \ - $(XCHAIN_GLIBC_PATH) $(XCHAIN_GLIBC_ENV) \ - $(GLIBC_DIR)/configure $(XCHAIN_GLIBC_AUTOCONF) - touch $@ - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -xchain-glibc_compile: $(STATEDIR)/xchain-glibc.compile - -$(STATEDIR)/xchain-glibc.compile: $(STATEDIR)/xchain-glibc.prepare - @$(call targetinfo, $@) -# -# Dan Kegel writes: -# -# glibc-2.3.x passes cross options to $(CC) when generating -# errlist-compat.c, which fails without a real cross-compiler. -# Fortunately, we don't need errlist-compat.c, since we just need .h -# files, so work around this by creating a fake errlist-compat.c and -# satisfying its dependencies. Another workaround might be to tell -# configure to not use any cross options to $(CC). The real fix would -# be to get install-headers to not generate errlist-compat.c. -# -# Robert Schwebel writes: -# -# Is this necessary? The lines below are commented out but it seems -# to compile anyway... -# -# Marc Kleine-Budde has also something to say: -# -# This is definitely needed by x86 -> ppc -# - $(XCHAIN_GLIBC_PATH) make -C $(XCHAIN_GLIBC_BUILDDIR) sysdeps/gnu/errlist.c - mkdir -p $(XCHAIN_GLIBC_BUILDDIR)/stdio-common - touch $(XCHAIN_GLIBC_BUILDDIR)/stdio-common/errlist-compat.c - touch $@ - touch $@ - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -xchain-glibc_install: $(STATEDIR)/xchain-glibc.install - -$(STATEDIR)/xchain-glibc.install: $(STATEDIR)/xchain-glibc.compile - @$(call targetinfo, $@) - - $(XCHAIN_GLIBC_PATH) make -C $(XCHAIN_GLIBC_BUILDDIR) \ - cross-compiling=yes install_root=$(CROSS_LIB_DIR) prefix="" \ - install-headers -# -# Dan Kegel says: -# -# Two headers -- stubs.h and features.h -- aren't installed by -# install-headers, so do them by hand. We can tolerate an empty -# stubs.h for the moment. See -# e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html -# - mkdir -p $(CROSS_LIB_DIR)/include/gnu - touch $(CROSS_LIB_DIR)/include/gnu/stubs.h - install -m 644 $(GLIBC_DIR)/include/features.h \ - $(CROSS_LIB_DIR)/include/features.h - - touch $@ - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -xchain-glibc_targetinstall: $(STATEDIR)/xchain-glibc.targetinstall - -$(STATEDIR)/xchain-glibc.targetinstall: $(STATEDIR)/xchain-glibc.install - touch $@ - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -xchain-glibc_clean: - -rm -rf $(STATEDIR)/xchain-glibc* - -rm -rf $(XCHAIN_GLIBC_BUILDDIR) -# vim: syntax=make diff --git a/rules/xchain-nasm.make b/rules/xchain-nasm.make index 614e7fd88..ec7158fdc 100644 --- a/rules/xchain-nasm.make +++ b/rules/xchain-nasm.make @@ -22,7 +22,7 @@ endif XCHAIN_NASM_VERSION = 0.98.38 XCHAIN_NASM = nasm-$(XCHAIN_NASM_VERSION) XCHAIN_NASM_SUFFIX = tar.bz2 -XCHAIN_NASM_URL = http://umn.dl.sourceforge.net/sourceforge/nasm/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX) +XCHAIN_NASM_URL = $(PTXCONF_SFMIRROR)/nasm/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX) XCHAIN_NASM_SOURCE = $(SRCDIR)/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX) XCHAIN_NASM_DIR = $(BUILDDIR)/$(XCHAIN_NASM) diff --git a/rules/xchain-scons.make b/rules/xchain-scons.make index 1adaa5a2b..76d9f7445 100644 --- a/rules/xchain-scons.make +++ b/rules/xchain-scons.make @@ -22,7 +22,7 @@ endif XCHAIN-SCONS_VERSION = 0.93 XCHAIN-SCONS = scons-$(XCHAIN-SCONS_VERSION) XCHAIN-SCONS_SUFFIX = tar.gz -XCHAIN-SCONS_URL = http://umn.dl.sourceforge.net/sourceforge/scons/$(XCHAIN-SCONS).$(XCHAIN-SCONS_SUFFIX) +XCHAIN-SCONS_URL = $(PTXCONF_SFMIRROR)/scons/$(XCHAIN-SCONS).$(XCHAIN-SCONS_SUFFIX) XCHAIN-SCONS_SOURCE = $(SRCDIR)/$(XCHAIN-SCONS).$(XCHAIN-SCONS_SUFFIX) XCHAIN-SCONS_DIR = $(BUILDDIR)/$(XCHAIN-SCONS) |