diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2004-10-18 11:27:13 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2004-10-18 11:27:13 +0000 |
| commit | 839282ecdfff3d7bf839d2251eea59d2d869aaac (patch) | |
| tree | b9a2ea9814e60fd3703939dcaf164d2811b6bece /rules | |
| parent | 05b4f999e3d0efc746643f4d88a7339e41348beb (diff) | |
| download | ptxdist-839282ecdfff3d7bf839d2251eea59d2d869aaac.tar.gz ptxdist-839282ecdfff3d7bf839d2251eea59d2d869aaac.tar.xz | |
merge with nativegcc branch
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@1885 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
89 files changed, 296 insertions, 397 deletions
diff --git a/rules/Definitions.make b/rules/Definitions.make index 739e08a5c..2ea2fad6d 100644 --- a/rules/Definitions.make +++ b/rules/Definitions.make @@ -7,3 +7,14 @@ comma=, space= quote=" +# +# remove_quotes +# +# Remove quotes from a variable definition +# +# $1: variable +# +remove_quotes = $(subst $(quote),,$(1)) + + + diff --git a/rules/at-spi.make b/rules/at-spi.make index 279e443e0..39d77fae0 100644 --- a/rules/at-spi.make +++ b/rules/at-spi.make @@ -76,10 +76,8 @@ AT-SPI_ENV = $(CROSS_ENV) # # autoconf # -AT-SPI_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +AT-SPI_AUTOCONF = $(CROSS_AUTOCONF) +AT-SPI_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/atk124.make b/rules/atk124.make index ba39f0029..bf19c9932 100644 --- a/rules/atk124.make +++ b/rules/atk124.make @@ -79,13 +79,8 @@ ATK_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -ATK_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -ATK_AUTOCONF += --build=$(GNU_HOST) -ATK_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) - -ifdef PTXCONF_ATK_FOO -ATK_AUTOCONF += --enable-foo -endif +ATK_AUTOCONF = $(CROSS_AUTOCONF) +ATK_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/atk.prepare: $(atk_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bash.make b/rules/bash.make index f1e14f5ab..58c954623 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -64,8 +64,7 @@ $(STATEDIR)/bash.extract: $(STATEDIR)/bash.get bash_prepare: $(STATEDIR)/bash.prepare -BASH_AUTOCONF = --build=$(GNU_HOST) -BASH_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +BASH_AUTOCONF = $(CROSS_AUTOCONF) BASH_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) BASH_AUTOCONF += --disable-sanity-checks BASH_AUTOCONF += --prefix=/usr --bindir=/bin diff --git a/rules/betaftpd.make b/rules/betaftpd.make index dbb97d46c..a7b09b1c3 100644 --- a/rules/betaftpd.make +++ b/rules/betaftpd.make @@ -78,10 +78,8 @@ BETAFTPD_ENV = $(CROSS_ENV) # # autoconf # -BETAFTPD_AUTOCONF = \ - --prefix=$(CROSS_LIB_DIR) \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) +BETAFTPD_AUTOCONF = $(CROSS_AUTOCONF) +BETAFTPD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) \ $(STATEDIR)/betaftpd.prepare: $(betaftpd_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bind.make b/rules/bind.make index d2f4a48c0..e109e24a2 100644 --- a/rules/bind.make +++ b/rules/bind.make @@ -76,11 +76,9 @@ BIND_ENV = $(CROSS_ENV) # # autoconf # -BIND_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) \ - --with-randomdev=/dev/random +BIND_AUTOCONF = $(CROSS_AUTOCONF) +BIND_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BIND_AUTOCONF += --with-randomdev=/dev/random ifdef BIND_THREADS BIND_AUTOCONF += --enable-threads diff --git a/rules/binutils.make b/rules/binutils.make index c64299365..9f75c4114 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -67,10 +67,9 @@ binutils_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/binutils.extract -BINUTILS_AUTOCONF = \ +BINUTILS_AUTOCONF = $(CROSS_AUTOCONF) +BINUTILS_AUTOCONF += \ --target=$(PTXCONF_GNU_TARGET) \ - --host=$(PTXCONF_GNU_TARGET) \ - --build=$(GNU_HOST) \ --enable-targets=$(PTXCONF_GNU_TARGET) \ --prefix=/usr \ --disable-nls \ diff --git a/rules/blackbox.make b/rules/blackbox.make index c4930e5c6..dcfe14f74 100644 --- a/rules/blackbox.make +++ b/rules/blackbox.make @@ -76,11 +76,9 @@ BLACKBOX_ENV = $(CROSS_ENV) # # autoconf # -BLACKBOX_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) \ - -disable-nls +BLACKBOX_AUTOCONF = $(CROSS_AUTOCONF) +BLACKBOX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BLACKBOX_AUTOCONF += -disable-nls BLACKBOX_AUTOCONF += --x-includes=/home/koan/ptxdist/ptxdist-testing/root/usr/X11R6/include BLACKBOX_AUTOCONF += --x-libraries=/home/koan/ptxdist/ptxdist-testing/root/usr/X11R6/lib diff --git a/rules/bonnie++.make b/rules/bonnie++.make index da22204ec..d298cd51b 100644 --- a/rules/bonnie++.make +++ b/rules/bonnie++.make @@ -79,10 +79,8 @@ BONNIE++_ENV = $(CROSS_ENV) # # autoconf # -BONNIE++_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +BONNIE++_AUTOCONF = $(CROSS_AUTOCONF) +BONNIE++_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/bonnie++.prepare: $(bonnie++_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/busybox.make b/rules/busybox.make index 913c598fe..4a52060d4 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -70,10 +70,10 @@ busybox_prepare: $(STATEDIR)/busybox.prepare BUSYBOX_PATH = PATH=$(CROSS_PATH) BUSYBOX_ENV = $(CROSS_ENV) -BUSYBOX_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)- +BUSYBOX_MAKEVARS = CROSS=$(PTXCONF_COMPILER_PREFIX) BUSYBOX_MAKEVARS += HOSTCC=$(HOSTCC) -BUSYBOX_MAKEVARS += EXTRA_CFLAGS='$(strip $(subst ",,$(TARGET_CFLAGS)))' -BUSYBOX_MAKEVARS += LDFLAGS='$(strip $(subst ",,$(TARGET_LDFLAGS)))' +BUSYBOX_MAKEVARS += EXTRA_CFLAGS='$(call remove_quotes,$(TARGET_CFLAGS))' +BUSYBOX_MAKEVARS += LDFLAGS='$(call remove_quotes,$(TARGET_LDFLAGS))' # # dependencies @@ -91,6 +91,8 @@ $(STATEDIR)/busybox.prepare: $(busybox_prepare_deps) $(BUSYBOX_PATH) make -C $(BUSYBOX_DIR) distclean $(BUSYBOX_MAKEVARS) grep -e PTXCONF_BB_ .config > $(BUSYBOX_DIR)/.config perl -i -p -e 's/PTXCONF_BB_//g' $(BUSYBOX_DIR)/.config + echo GCC_PREFIX=$(GCC_PREFIX) + perl -i -p -e 's/^CROSS_COMPILER_PREFIX=.*$$/CROSS_COMPILER_PREFIX=\"\"$(GCC_PREFIX)/g' $(BUSYBOX_DIR)/.config yes "" | $(BUSYBOX_PATH) make -C $(BUSYBOX_DIR) oldconfig $(BUSYBOX_MAKEVARS) $(BUSYBOX_PATH) make -C $(BUSYBOX_DIR) dep $(BUSYBOX_MAKEVARS) diff --git a/rules/coreutils.make b/rules/coreutils.make index 9815eb0fd..4dde0a7f9 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -55,8 +55,7 @@ $(STATEDIR)/coreutils.extract: $(STATEDIR)/coreutils.get coreutils_prepare: $(STATEDIR)/coreutils.prepare -COREUTILS_AUTOCONF = --build=$(GNU_HOST) -COREUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +COREUTILS_AUTOCONF = $(CROSS_AUTOCONF) COREUTILS_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) COREUTILS_PATH = PATH=$(CROSS_PATH) diff --git a/rules/crosstool.in b/rules/crosstool.in index e33ce7a25..c70733967 100644 --- a/rules/crosstool.in +++ b/rules/crosstool.in @@ -28,6 +28,10 @@ choice bool prompt "3.3.2" + config GCC_3_3_3 + bool + prompt "3.3.3" + config GCC_3_4_0 bool prompt "3.4.0" @@ -47,6 +51,7 @@ config GCC_VERSION default "2.95.3" if GCC_2_95_3 default "3.2.3" if GCC_3_2_3 default "3.3.2" if GCC_3_3_2 + default "3.3.3" if GCC_3_3_2 default "3.4.0" if GCC_3_4_0 default "3.4.1" if GCC_3_4_1 default "3.4.2" if GCC_3_4_2 @@ -139,7 +144,7 @@ config GCC_MULTILIB config GNU_TARGET string - prompt "Compiler Prefix" + prompt "GNU Target" default "arm-softfloat-linux-gnu" if ARM_ARCH_LE && GLIBC default "armb-unknown-linux-gnu" if ARM_ARCH_BE && GLIBC default "arm-elf" if ARCH_ARM_NOMMU && GLIBC @@ -178,6 +183,11 @@ config GNU_TARGET default "sh3-uclibc-linux-gnu" if SH_ARCH_SH3 && UCLIBC default "sh4-uclibc-linux-gnu" if SH_ARCH_SH4 && UCLIBC +config COMPILER_PREFIX + string + prompt "Compiler Prefix" + default "$(PTXCONF_GNU_TARGET)-" + comment "Non-Crosstool Tools" config XCHAIN-DISTCC diff --git a/rules/db41.make b/rules/db41.make index 57c412dad..5f0edb835 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -75,9 +75,8 @@ DB41_ENV = $(CROSS_ENV) # # autoconf # +DB41_AUTOCONF = $(CROSS_AUTOCONF) DB41_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -DB41_AUTOCONF += --build=$(GNU_HOST) -DB41_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) DB41_AUTOCONF += --enable-cxx $(STATEDIR)/db41.prepare: $(db41_prepare_deps) diff --git a/rules/dropbear.make b/rules/dropbear.make index cf11d448f..54144d829 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -80,9 +80,8 @@ DROPBEAR_ENV = $(CROSS_ENV) # # autoconf # -DROPBEAR_AUTOCONF = --prefix=/usr -DROPBEAR_AUTOCONF += --build=$(GNU_HOST) -DROPBEAR_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +DROPBEAR_AUTOCONF = $(CROSS_AUTOCONF) +DROPBEAR_AUTOCONF += --prefix=/usr DROPBEAR_AUTOCONF += --disable-nls ifdef PTXCONF_DROPBEAR_DIS_ZLIB diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 94125cc78..fe3b5b4c2 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -62,10 +62,9 @@ $(STATEDIR)/e2fsprogs.extract: $(STATEDIR)/e2fsprogs.get e2fsprogs_prepare: $(STATEDIR)/e2fsprogs.prepare -E2FSPROGS_AUTOCONF = --prefix=/usr +E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) +E2FSPROGS_AUTOCONF += --prefix=/usr E2FSPROGS_AUTOCONF += --enable-fsck -E2FSPROGS_AUTOCONF += --build=$(GNU_HOST) -E2FSPROGS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) E2FSPROGS_AUTOCONF += --with-cc=$(PTXCONF_GNU_TARGET)-gcc E2FSPROGS_AUTOCONF += --with-linker=$(PTXCONF_GNU_TARGET)-ld E2FSPROGS_PATH = PATH=$(CROSS_PATH) diff --git a/rules/efax.make b/rules/efax.make index 8b8580fec..286431106 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -79,10 +79,8 @@ EFAX_ENV = $(CROSS_ENV) # # autoconf # -EFAX_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +EFAX_AUTOCONF = $(CROSS_AUTOCONF) +EFAX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/efax.prepare: $(efax_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/ethereal.make b/rules/ethereal.make index 6fb1e1f64..de02ce1ca 100644 --- a/rules/ethereal.make +++ b/rules/ethereal.make @@ -79,8 +79,7 @@ ETHEREAL_ENV = $(CROSS_ENV) # # autoconf # -ETHEREAL_AUTOCONF = --build=$(GNU_HOST) -ETHEREAL_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +ETHEREAL_AUTOCONF = $(CROSS_AUTOCONF) ETHEREAL_AUTOCONF += --prefix=$(CROSS_LIB_DIR) ETHEREAL_AUTOCONF += --disable-usr-local diff --git a/rules/expat.make b/rules/expat.make index f2a761859..21003f0ff 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -77,13 +77,8 @@ EXPAT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -EXPAT_AUTOCONF = --prefix=/usr -EXPAT_AUTOCONF += --build=$(GNU_HOST) -EXPAT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) - -ifdef PTXCONF_EXPAT_FOO -EXPAT_AUTOCONF += --enable-foo -endif +EXPAT_AUTOCONF = $(CROSS_AUTOCONF) +EXPAT_AUTOCONF += --prefix=/usr $(STATEDIR)/expat.prepare: $(expat_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/flash.make b/rules/flash.make index b4574d7df..e3aef9f17 100644 --- a/rules/flash.make +++ b/rules/flash.make @@ -93,9 +93,8 @@ FLASH_ENV = $(CROSS_ENV) # # autoconf # -FLASH_AUTOCONF = --prefix=/usr -FLASH_AUTOCONF += --build=$(GNU_HOST) -FLASH_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +FLASH_AUTOCONF = $(CROSS_AUTOCONF) +FLASH_AUTOCONF += --prefix=/usr FLASH_AUTOCONF += --with-ncurses-path=$(NCURSES_DIR) $(STATEDIR)/flash.prepare: $(flash_prepare_deps) diff --git a/rules/fltk.make b/rules/fltk.make index 0ae72fb64..3586b1875 100644 --- a/rules/fltk.make +++ b/rules/fltk.make @@ -76,9 +76,8 @@ FLTK_ENV = $(CROSS_ENV) # # autoconf # +FLTK_AUTOCONF = $(CROSS_AUTOCONF) FLTK_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -FLTK_AUTOCONF += --build=$(GNU_HOST) -FLTK_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) FLTK_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11 FLTK_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib FLTK_AUTOCONF += --enable-shared diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make index 2a0d0f2b2..4f0e29945 100644 --- a/rules/fontconfig22.make +++ b/rules/fontconfig22.make @@ -89,19 +89,14 @@ FONTCONFIG22_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # +FONTCONFIG22_AUTOCONF = $(CROSS_AUTOCONF) FONTCONFIG22_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -FONTCONFIG22_AUTOCONF += --build=$(GNU_HOST) -FONTCONFIG22_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) FONTCONFIG22_AUTOCONF += --disable-docs FONTCONFIG22_AUTOCONF += --with-expat-lib=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib FONTCONFIG22_AUTOCONF += --with-expat-include=$(PTXCONF_PREFIX)/include FONTCONFIG22_AUTOCONF += --with-freetype-config="pkg-config freetype2" -ifdef PTXCONF_FONTCONFIG22_FOO -FONTCONFIG22_AUTOCONF += --enable-foo -endif - $(STATEDIR)/fontconfig22.prepare: $(fontconfig22_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(FONTCONFIG22_BUILDDIR)) diff --git a/rules/freetype214.make b/rules/freetype214.make index 6ffb5832e..ee74a025e 100644 --- a/rules/freetype214.make +++ b/rules/freetype214.make @@ -79,9 +79,8 @@ FREETYPE214_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -FREETYPE214_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -FREETYPE214_AUTOCONF += --build=$(GNU_HOST) -FREETYPE214_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +FREETYPE214_AUTOCONF = $(CROSS_AUTOCONF) +FREETYPE214_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/freetype214.prepare: $(freetype214_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gail.make b/rules/gail.make index 747425d72..61991e42e 100644 --- a/rules/gail.make +++ b/rules/gail.make @@ -77,10 +77,8 @@ GAIL_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -GAIL_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +GAIL_AUTOCONF = $(CROSS_AUTOCONF) +GAIL_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/gail.prepare: $(gail_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gawk.make b/rules/gawk.make index 58509097b..430222df8 100644 --- a/rules/gawk.make +++ b/rules/gawk.make @@ -19,8 +19,8 @@ endif # # Paths and names # -GAWK_VERSION = 3.1.4 -GAWK = gawk-$(GAWK_VERSION) +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_SOURCE = $(SRCDIR)/$(GAWK).$(GAWK_SUFFIX) @@ -76,10 +76,8 @@ GAWK_ENV = $(CROSS_ENV) # # autoconf # -GAWK_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +GAWK_AUTOCONF = $(CROSS_AUTOCONF) +GAWK_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/gawk.prepare: $(gawk_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gdb.make b/rules/gdb.make index 01a7dcb22..3a452a771 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -78,9 +78,8 @@ gdb_prepare: $(STATEDIR)/gdb.prepare # # dependencies # -gdb_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/gdb.extract +gdb_prepare_deps = $(STATEDIR)/virtual-xchain.install +gdb_prepare_deps += $(STATEDIR)/gdb.extract ifdef PTXCONF_GDB_TERMCAP gdb_prepare_deps += $(STATEDIR)/termcap.install @@ -101,10 +100,9 @@ endif # # autoconf # -GDB_AUTOCONF = --prefix=/usr -GDB_AUTOCONF += --build=$(GNU_HOST) -GDB_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) -GDB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) +GDB_AUTOCONF = $(CROSS_AUTOCONF) +GDB_AUTOCONF += --target=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) +GDB_AUTOCONF += --prefix=/usr $(STATEDIR)/gdb.prepare: $(gdb_prepare_deps) @$(call targetinfo, $@) @@ -119,9 +117,9 @@ $(STATEDIR)/gdb.prepare: $(gdb_prepare_deps) # prepare libiberty first with the cross options to avoid that # it runs the configure stages automatically and with the wrong # options (host) during the compile stage - # + mkdir -p $(GDB_BUILDDIR)/libiberty - ln -s $(GDB_BUILDDIR)/libiberty $(GDB_BUILDDIR)/build-i686-host-linux-gnu/libiberty + ln -s $(GDB_BUILDDIR)/libiberty $(GDB_BUILDDIR)/build-$(GNU_HOST)/libiberty cd $(GDB_BUILDDIR)/libiberty && \ $(GDB_PATH) $(GDB_ENV) \ $(GDB_DIR)/libiberty/configure $(GDB_AUTOCONF) diff --git a/rules/gettext.make b/rules/gettext.make index 4717446c0..17cd30cdf 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -77,9 +77,8 @@ GETTEXT_ENV = $(CROSS_ENV) # autoconf # -GETTEXT_AUTOCONF = --prefix=/usr \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) +GETTEXT_AUTOCONF = $(CROSS_AUTOCONF) +GETTEXT_AUTOCONF += --prefix=/usr # This is braindead but correct :-) GETTEXT_AUTOCONF += --disable-nls diff --git a/rules/glib1210.make b/rules/glib1210.make index 3e42652e1..4229e490d 100644 --- a/rules/glib1210.make +++ b/rules/glib1210.make @@ -87,9 +87,8 @@ GLIB1210_ENV = $(CROSS_ENV) # # autoconf # -GLIB1210_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -GLIB1210_AUTOCONF += --build=$(GNU_HOST) -GLIB1210_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +GLIB1210_AUTOCONF = $(CROSS_AUTOCONF) +GLIB1210_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) GLIB1210_AUTOCONF += --with-threads=posix diff --git a/rules/glib22.make b/rules/glib22.make index 70e2e3293..291ad7197 100644 --- a/rules/glib22.make +++ b/rules/glib22.make @@ -86,9 +86,8 @@ GLIB22_ENV += glib_cv_stack_grows=no # # autoconf # -GLIB22_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -GLIB22_AUTOCONF += --build=$(GNU_HOST) -GLIB22_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +GLIB22_AUTOCONF = $(CROSS_AUTOCONF) +GLIB22_AUTOCONF += --prefix=$(CROSS_LIB_DIR) GLIB22_AUTOCONF += --with-threads=posix diff --git a/rules/glibc.make b/rules/glibc.make index 5b1dc82c3..3b317ede2 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -1,4 +1,4 @@ -# -*-makefile-*- +# # $Id$ # # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany @@ -34,6 +34,8 @@ 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 @@ -101,32 +103,26 @@ GLIBC_ZONEFILES-$(PTXCONF_GLIBC_ZONEINFO_UNIVERSAL) += Universal # Get # ---------------------------------------------------------------------------- -glibc_get: $(STATEDIR)/glibc.get +glibc_get: $(STATEDIR)/glibc.get -glibc_get_deps = \ - $(GLIBC_SOURCE) \ - $(STATEDIR)/glibc-patches.get +glibc_get_deps = $(GLIBC_SOURCE) ifdef PTXCONF_GLIBC_PTHREADS -glibc_get_deps += \ - $(GLIBC_THREADS_SOURCE) \ - $(STATEDIR)/glibc-threads-patches.get +glibc_get_deps += $(STATEDIR)/glibc-threads.get endif -$(STATEDIR)/glibc.get: $(glibc_get_deps) - @$(call targetinfo, $@) - touch $@ +glibc_threads_get_deps = $(GLIBC_THREADS_SOURCE) -$(STATEDIR)/glibc-patches.get: +$(STATEDIR)/glibc.get: $(glibc_get_deps) @$(call targetinfo, $@) @$(call get_patches, $(GLIBC)) touch $@ -$(STATEDIR)/glibc-threads-patches.get: +$(STATEDIR)/glibc-threads.get: $(glibc_threads_get_deps) @$(call targetinfo, $@) @$(call get_patches, $(GLIBC_THREADS)) touch $@ - + $(GLIBC_SOURCE): @$(call targetinfo, $@) @$(call get, $(GLIBC_URL)) @@ -167,41 +163,33 @@ $(STATEDIR)/glibc-threads.extract: $(STATEDIR)/glibc.get # Prepare # ---------------------------------------------------------------------------- -glibc_prepare: $(STATEDIR)/glibc.prepare +glibc_prepare: $(STATEDIR)/glibc.prepare -# -# dependencies -# glibc_prepare_deps = $(STATEDIR)/autoconf213.install glibc_prepare_deps += $(STATEDIR)/glibc.extract glibc_prepare_deps += $(STATEDIR)/xchain-kernel.install -# -# arcitecture dependend configuration -# -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 = $(CROSS_AUTOCONF) +GLIBC_AUTOCONF += --with-headers=$(CROSS_LIB_DIR)/include +GLIBC_AUTOCONF += --enable-clocale=gnu +GLIBC_AUTOCONF += --without-tls +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=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(CROSS_PATH) +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) +GLIBC_ENV = $(CROSS_ENV) BUILD_CC=$(HOSTCC) # # features @@ -230,26 +218,30 @@ ifdef PTXCONF_GLIBC_PTHREADS GLIBC_AUTOCONF += --enable-add-ons=linuxthreads endif +# from config/arch/*.dat: +# additional architecture dependend configure options + GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG) $(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 $(PTXCONF_GNU_TARGET) \ - $(GLIBC_AUTOCONF) - # don't compile programs - echo "build-programs=no" >> $(GLIBC_BUILDDIR)/configparms + 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 had endianess issues. - # + # 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 @@ -260,44 +252,65 @@ $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps) # Compile # ---------------------------------------------------------------------------- -glibc_compile: $(STATEDIR)/glibc.compile +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 + #touch $(GLIBC_BUILDDIR)/iconv/iconv_prog + #touch $(GLIBC_BUILDDIR)/login/pt_chown + touch $@ # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- - -glibc_install: $(STATEDIR)/glibc.install +glibc_install: $(STATEDIR)/glibc.install $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile @$(call targetinfo, $@) - cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make \ - 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 -# + + + # 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; \ @@ -309,11 +322,7 @@ $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile fi; \ done - # - # Now build the zoneinfo files; see note in prepare stage - # ifdef PTXCONF_GLIBC_ZONEINFO - cd $(GLIBC_ZONEDIR) && CC=$(HOSTCC) make zic ( cd $(GLIBC_ZONEDIR) && \ for file in `find . -name "z.*" | sed -e "s,.*z.\(.*\),\1,g"`; do \ ./zic -d zoneinfo $$file || echo "failed [$$FILE]"; \ @@ -326,7 +335,7 @@ endif # Target-Install # ---------------------------------------------------------------------------- -glibc_targetinstall: $(STATEDIR)/glibc.targetinstall +glibc_targetinstall: $(STATEDIR)/glibc.targetinstall glibc_targetinstall_deps = $(STATEDIR)/glibc.install @@ -338,26 +347,27 @@ 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? :) -# + + # FIXME: use our root install macros here + + # CAREFUL: don't never ever make install!!! + # but we never ever run ptxdist as root, do we? :) mkdir -p $(ROOTDIR)/lib 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 -# + + # 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* -# -# we don't wanna copy libpthread.so, cause this may be a ld linker script, no shared lib -# + # 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/ @@ -442,9 +452,7 @@ ifdef PTXCONF_GLIBC_GCONV_ISO8859_1 endif endif - # # 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/; \ diff --git a/rules/gmp3.make b/rules/gmp3.make index 9eb7b642e..8ac795a12 100644 --- a/rules/gmp3.make +++ b/rules/gmp3.make @@ -57,12 +57,10 @@ gmp3_prepare_deps = \ GMP3_PATH = PATH=$(CROSS_PATH) GMP3_ENV = $(CROSS_ENV) -GMP3_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) \ - --enable-shared \ - --enable-static +GMP3_AUTOCONF = $(CROSS_AUTOCONF) +GMP3_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +GMP3_AUTOCONF += --enable-shared +GMP3_AUTOCONF += --enable-static $(STATEDIR)/gmp3.prepare: $(gmp3_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 44a50855f..33411ea02 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -81,10 +81,8 @@ GNUPLOT_ENV = $(CROSS_ENV) # # autoconf # -GNUPLOT_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +GNUPLOT_AUTOCONF = $(CROSS_AUTOCONF) +GNUPLOT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) GNUPLOT_AUTOCONF += --disable-history-file GNUPLOT_AUTOCONF += --disable-mouse diff --git a/rules/grub.make b/rules/grub.make index d137367da..7b3c49c9d 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -65,8 +65,7 @@ GRUB_PATH = PATH=$(CROSS_PATH) GRUB_ENV = $(CROSS_ENV) CFLAGS='' -GRUB_AUTOCONF = --build=$(GNU_HOST) -GRUB_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +GRUB_AUTOCONF = $(CROSS_AUTOCONF) GRUB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) GRUB_AUTOCONF += --prefix=$(PTXCONF_PREFIX) diff --git a/rules/gtk1210.make b/rules/gtk1210.make index ad2424346..4a0f3db4c 100644 --- a/rules/gtk1210.make +++ b/rules/gtk1210.make @@ -78,9 +78,8 @@ GTK1210_ENV += ac_cv_have_x='have_x=yes ac_x_includes=$(PTXCONF_PREFIX)/$(PTXCON # # autoconf # -GTK1210_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -GTK1210_AUTOCONF += --build=$(GNU_HOST) -GTK1210_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +GTK1210_AUTOCONF = $(CROSS_AUTOCONF) +GTK1210_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) GTK1210_AUTOCONF += --with-threads=posix GTK1210_AUTOCONF += --with-glib-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make index 9bbd168f0..eeb635fcc 100644 --- a/rules/gtk2-engines.make +++ b/rules/gtk2-engines.make @@ -77,10 +77,8 @@ GTK2-ENGINES_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -GTK2-ENGINES_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +GTK2-ENGINES_AUTOCONF = $(CROSS_AUTOCONF) +GTK2-ENGINES_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/gtk2-engines.prepare: $(gtk2-engines_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gtk22.make b/rules/gtk22.make index c478b96e5..a943c1c46 100644 --- a/rules/gtk22.make +++ b/rules/gtk22.make @@ -83,9 +83,8 @@ GTK22_ENV += FREETYPE_CONFIG="pkg-config freetype2" # # autoconf # +GTK22_AUTOCONF = $(CROSS_AUTOCONF) GTK22_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -GTK22_AUTOCONF += --build=$(GNU_HOST) -GTK22_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) GTK22_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 # FIXME GTK22_AUTOCONF += --without-libtiff diff --git a/rules/hexedit.make b/rules/hexedit.make index 7a9ad745b..358353be4 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -75,15 +75,13 @@ hexedit_prepare_deps = \ HEXEDIT_PATH = PATH=$(CROSS_PATH) HEXEDIT_ENV = $(CROSS_ENV) -HEXEDIT_ENV += LDFLAGS='$(strip $(subst ",,$(TARGET_LDFLAGS))) -static' +HEXEDIT_ENV += LDFLAGS='$(strip $(subst $(quote),,$(TARGET_LDFLAGS))) -static' # # autoconf # -HEXEDIT_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +HEXEDIT_AUTOCONF = $(CROSS_AUTOCONF) +HEXEDIT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/hexedit.prepare: $(hexedit_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/hosttool-e2fsprogs.make b/rules/hosttool-e2fsprogs.make index 8617d81b7..981484e6d 100644 --- a/rules/hosttool-e2fsprogs.make +++ b/rules/hosttool-e2fsprogs.make @@ -63,13 +63,13 @@ $(STATEDIR)/hosttool-e2fsprogs.extract: $(STATEDIR)/hosttool-e2fsprogs.get hosttool-e2fsprogs_prepare: $(STATEDIR)/hosttool-e2fsprogs.prepare -HOSTTOOLS_E2FSPROGS_AUTOCONF = --prefix=/usr +# FIXME - doesn't seem to be a hosttool... +HOSTTOOLS_E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) +HOSTTOOLS_E2FSPROGS_AUTOCONF += --prefix=/usr HOSTTOOLS_E2FSPROGS_AUTOCONF += --enable-fsck -HOSTTOOLS_E2FSPROGS_AUTOCONF += --build=$(GNU_HOST) -HOSTTOOLS_E2FSPROGS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-cc=$(PTXCONF_GNU_TARGET)-gcc HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-linker=$(PTXCONF_GNU_TARGET)-ld -HOSTTOOLS_E2FSPROGS_PATH = PATH=$(CROSS_PATH) +HOSTTOOLS_E2FSPROGS_PATH = PATH=$(CROSS_PATH) HOSTTOOLS_E2FSPROGS_ENV = $(CROSS_ENV) HOSTTOOLS_E2FSPROGS_ENV += BUILD_CC=$(HOSTCC) diff --git a/rules/inetutils.make b/rules/inetutils.make index 9fd1cb22f..53ea6f08a 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -77,10 +77,8 @@ INETUTILS_ENV = $(CROSS_ENV) # # autoconf # -INETUTILS_AUTOCONF = \ - --prefix=/usr \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +INETUTILS_AUTOCONF = $(CROSS_AUTOCONF) +INETUTILS_AUTOCONF += --prefix=/usr \ --with-PATH-CP=/bin/cp \ --localstatedir=/var \ --sysconfdir=/etc diff --git a/rules/jed.make b/rules/jed.make index d2320bcb6..2b8fde58d 100644 --- a/rules/jed.make +++ b/rules/jed.make @@ -80,10 +80,8 @@ JED_ENV = $(CROSS_ENV) # # autoconf # -JED_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +JED_AUTOCONF = $(CROSS_AUTOCONF) +JED_AUTOCONF = --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/jed.prepare: $(jed_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/kaffe.make b/rules/kaffe.make index b020e776b..81ce9092e 100644 --- a/rules/kaffe.make +++ b/rules/kaffe.make @@ -114,9 +114,8 @@ KAFFE_ENV = $(CROSS_ENV) KAFFEH=$(PTXCONF_PREFIX)/bin/kaffeh # # autoconf # -KAFFE_AUTOCONF = --prefix=/usr -KAFFE_AUTOCONF += --build=$(GNU_HOST) -KAFFE_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +KAFFE_AUTOCONF = $(CROSS_KAFFEE) +KAFFE_AUTOCONF += --prefix=/usr ifdef PTXCONF_KAFFE_ENG_INTRP KAFFE_AUTOCONF += --with-engine=intrp diff --git a/rules/konq-e.make b/rules/konq-e.make index d763bc676..a37ffe554 100644 --- a/rules/konq-e.make +++ b/rules/konq-e.make @@ -77,11 +77,8 @@ KONQ-E_ENV = $(CROSS_ENV) # # autoconf # -KONQ-E_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -KONQ-E_AUTOCONF += --build=$(GNU_HOST) -KONQ-E_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) - -#KONQ-E_AUTOCONF += +KONQ-E_AUTOCONF = $(CROSS_AUTOCONF) +KONQ-E_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) $(STATEDIR)/konq-e.prepare: $(konq-e_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make index 8ba7ace3d..d5724df88 100644 --- a/rules/libIDL-2.make +++ b/rules/libIDL-2.make @@ -78,9 +78,8 @@ LIBIDL-2_ENV += libIDL_cv_long_long_format=ll # # autoconf # -LIBIDL-2_AUTOCONF = --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -LIBIDL-2_AUTOCONF += --build=$(GNU_HOST) -LIBIDL-2_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +LIBIDL-2_AUTOCONF = $(CROSS_AUTOCONF) +LIBIDL-2_AUTOCONF += --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) ifdef PTXCONF_LIBIDL-2_FOO LIBIDL-2_AUTOCONF += --enable-foo diff --git a/rules/libIDL068.make b/rules/libIDL068.make index f717c117d..1414da4a7 100644 --- a/rules/libIDL068.make +++ b/rules/libIDL068.make @@ -78,9 +78,8 @@ LIBIDL068_ENV += PKG_CONFIG_PATH=../$(GLIB22):../$(PANGO12):../$(ATK124):../$(LI # # autoconf # -LIBIDL068_AUTOCONF = --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -LIBIDL068_AUTOCONF += --build=$(GNU_HOST) -LIBIDL068_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +LIBIDL068_AUTOCONF = $(CROSS_AUTOCONF) +LIBIDL068_AUTOCONF += --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) ifdef PTXCONF_LIBIDL068_FOO LIBIDL068_AUTOCONF += --enable-foo diff --git a/rules/libart.make b/rules/libart.make index 05d15b8f7..efa2d3a38 100644 --- a/rules/libart.make +++ b/rules/libart.make @@ -77,10 +77,8 @@ LIBART_ENV = $(CROSS_ENV) # # autoconf # -LIBART_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +LIBART_AUTOCONF = $(CROSS_AUTOCONF) +LIBART_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/libart.prepare: $(libart_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libgd.make b/rules/libgd.make index 62e112006..82358c594 100644 --- a/rules/libgd.make +++ b/rules/libgd.make @@ -77,9 +77,8 @@ LIBGD_ENV = $(CROSS_ENV) # # autoconf # -LIBGD_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -LIBGD_AUTOCONF += --build=$(GNU_HOST) -LIBGD_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +LIBGD_AUTOCONF = $(CROSS_AUTOCONF) +LIBGD_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) #LIBGD_AUTOCONF += diff --git a/rules/libglade.make b/rules/libglade.make index 67fbd725c..63268f7af 100644 --- a/rules/libglade.make +++ b/rules/libglade.make @@ -78,10 +78,8 @@ LIBGLADE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBGLADE_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +LIBGLADE_AUTOCONF = $(CROSS_AUTOCONF) +LIBGLADE_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/libglade.prepare: $(libglade_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make index ef82efdaf..3a51e9363 100644 --- a/rules/libgnomecanvas.make +++ b/rules/libgnomecanvas.make @@ -78,10 +78,8 @@ LIBGNOMECANVAS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -LIBGNOMECANVAS_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +LIBGNOMECANVAS_AUTOCONF = $(CROSS_AUTOCONF) +LIBGNOMECANVAS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/libgnomecanvas.prepare: $(libgnomecanvas_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libnet.make b/rules/libnet.make index f985aba97..f0cff5541 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -86,11 +86,9 @@ LIBNET_ENV = \ # # autoconf # -LIBNET_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --with-pf_packet=yes +LIBNET_AUTOCONF = $(CROSS_AUTOCONF) +LIBNET_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBNET_AUTOCONF += --with-pf_packet=yes $(STATEDIR)/libnet.prepare: $(libnet_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/liboop.make b/rules/liboop.make index 8d85d692c..5dfc16ccc 100644 --- a/rules/liboop.make +++ b/rules/liboop.make @@ -80,10 +80,8 @@ LIBOOP_ENV = \ # # autoconf # -LIBOOP_AUTOCONF = \ - --prefix=$(CROSS_LIB_DIR) \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +LIBOOP_AUTOCONF = $(CROSS_AUTOCONF) +LIBOOP_AUTOCONF = --prefix=$(CROSS_LIB_DIR) \ --without-tcl \ --without-glib diff --git a/rules/libpcap.make b/rules/libpcap.make index 1a8dd9790..4203198b2 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -78,11 +78,9 @@ LIBPCAP_ENV = \ # # autoconf # -LIBPCAP_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --with-pcap=linux +LIBPCAP_AUTOCONF = $(CROSS_AUTOCONF) +LIBPCAP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBPCAP_AUTOCONF += --with-pcap=linux $(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libpng125.make b/rules/libpng125.make index 3ec0a1e97..eddcdbeab 100644 --- a/rules/libpng125.make +++ b/rules/libpng125.make @@ -83,10 +83,6 @@ LIBPNG125_ENV += prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) LIBPNG125_ENV += ZLIBLIB=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib LIBPNG125_ENV += ZLIBINC=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include -ifdef PTXCONF_LIBPNG125_FOO -LIBPNG125_AUTOCONF += --enable-foo -endif - $(STATEDIR)/libpng125.prepare: $(libpng125_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(LIBPNG125_BUILDDIR)) diff --git a/rules/libxml2.make b/rules/libxml2.make index 2cfe08094..bcc80dfed 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -77,10 +77,8 @@ LIBXML2_ENV = $(CROSS_ENV) # # autoconf # -LIBXML2_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +LIBXML2_AUTOCONF = $(CROSS_AUTOCONF) +LIBXML2_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/libxml2.prepare: $(libxml2_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/lrzsz.make b/rules/lrzsz.make index 5cb7af872..e5161889f 100644 --- a/rules/lrzsz.make +++ b/rules/lrzsz.make @@ -77,9 +77,8 @@ LSZRZ_ENV += CFLAGS=-Wstrict-prototypes # # autoconf # +LSZRZ_AUTOCONF = $(CROSS_AUTOCONF) LSZRZ_AUTOCONF = --prefix=/usr -LSZRZ_AUTOCONF += --build=$(GNU_HOST) -LSZRZ_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/lrzsz.prepare: $(lrzsz_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/lsh.make b/rules/lsh.make index ab3e3ceac..ed7f5c4ce 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -85,11 +85,10 @@ LSH_ENV = $(CROSS_ENV) # # autoconf # +LSH_AUTOCONF = $(CROSS_AUTOCONF) LSH_AUTOCONF = \ --prefix=/usr \ --sysconfdir=/etc/lsh \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ --disable-kerberos \ --disable-pam \ --disable-tcp-forward \ diff --git a/rules/ltt.make b/rules/ltt.make index 9c3ca1b1c..dec6e3e5c 100644 --- a/rules/ltt.make +++ b/rules/ltt.make @@ -70,6 +70,7 @@ LTT_PATH = PATH=$(CROSS_PATH) LTT_ENV = $(CROSS_ENV) LTT_ENV += ac_cv_func_setvbuf_reversed=no ltt_cv_have_mbstate_t=yes +LTT_AUTOCONF = $(CROSS_AUTOCONF) LTT_AUTOCONF += --prefix=/usr LTT_AUTOCONF += --with-gtk=no diff --git a/rules/mad.make b/rules/mad.make index c03afdc3b..0913d24cd 100644 --- a/rules/mad.make +++ b/rules/mad.make @@ -75,10 +75,8 @@ MAD_ENV = $(CROSS_ENV) # # autoconf # -MAD_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +MAD_AUTOCONF = $(CROSS_AUTOCONF) +MAD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/mad.prepare: $(mad_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/madwifi.make b/rules/madwifi.make index 0e947df4d..8e00380f2 100644 --- a/rules/madwifi.make +++ b/rules/madwifi.make @@ -94,10 +94,8 @@ MADWIFI_ENV += TARGET=i386-elf # # autoconf # -MADWIFI_AUTOCONF = \ - --build=$(HOST) \ - --host=$(TARGET) \ - --prefix=$(SYSROOT) +MADWIFI_AUTOCONF = $(CROSS_AUTOCONF) +MADWIFI_AUTOCONF += --prefix=$(SYSROOT) $(STATEDIR)/madwifi.prepare: $(madwifi_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/memtest.make b/rules/memtest.make index 0dd53e1bb..681085c58 100644 --- a/rules/memtest.make +++ b/rules/memtest.make @@ -77,10 +77,8 @@ MEMTEST_ENV = $(CROSS_ENV) # # autoconf # -MEMTEST_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +MEMTEST_AUTOCONF = $(CROSS_AUTOCONF) +MEMTEST_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/memtest.prepare: $(memtest_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/mfirebird.make b/rules/mfirebird.make index c58c4466c..f393c8d6d 100644 --- a/rules/mfirebird.make +++ b/rules/mfirebird.make @@ -100,9 +100,7 @@ MFIREBIRD_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # autoconf # -MFIREBIRD_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -MFIREBIRD_AUTOCONF += --build=$(GNU_HOST) -MFIREBIRD_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +MFIREBIRD_AUTOCONF = $(CROSS_AUTOCONF) MFIREBIRD_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 diff --git a/rules/nano.make b/rules/nano.make index b30083a70..e5cb1db6e 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -79,10 +79,8 @@ NANO_ENV = $(CROSS_ENV) # # autoconf # -NANO_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +NANO_AUTOCONF = $(CROSS_AUTOCONF) +NANO_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/nano.prepare: $(nano_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/ncurses.make b/rules/ncurses.make index 3145cdbe8..a51b8b60f 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -66,18 +66,16 @@ ncurses_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/ncurses.extract -NCURSES_PATH = PATH=$(CROSS_PATH) -NCURSES_ENV = \ - $(CROSS_ENV) +NCURSES_PATH = PATH=$(CROSS_PATH) +NCURSES_ENV = $(CROSS_ENV) # # RSC: --with-build-cflags: ncurses seems to forget to include it's own # include directory... # -NCURSES_AUTOCONF =\ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +NCURSES_AUTOCONF = $(CROSS_AUTOCONF) +NCURSES_AUTOCONF += \ --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=/etc \ diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make index 3f755028e..805944fb4 100644 --- a/rules/nfs-utils.make +++ b/rules/nfs-utils.make @@ -67,8 +67,7 @@ nfsutils_prepare: $(STATEDIR)/nfsutils.prepare NFSUTILS_PATH = PATH=$(CROSS_PATH) NFSUTILS_ENV += CC_FOR_BUILD=$(HOSTCC) $(CROSS_ENV) -NFSUTILS_AUTOCONF = --build=$(GNU_HOST) -NFSUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +NFSUTILS_AUTOCONF = $(CROSS_AUTOCONF) # FIXME: these are not probed correctly when cross compiling... NFSUTILS_AUTOCONF += ac_cv_func_malloc_0_nonnull=yes diff --git a/rules/nmap.make b/rules/nmap.make index 7f3b7bd01..48a0c38b6 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -83,12 +83,9 @@ NMAP_ENV = \ # # autoconf # -NMAP_AUTOCONF =\ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=/usr \ - --with-pcap=linux - +NMAP_AUTOCONF = $(CROSS_AUTOCONF) +NMAP_AUTOCONF += --prefix=/usr +NMAP_AUTOCONF += --with-pcap=linux # # FIXME: # diff --git a/rules/ntp.make b/rules/ntp.make index 2c24952a5..13958e6e3 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -76,11 +76,9 @@ NTP_ENV = $(CROSS_ENV) # # autoconf # -NTP_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) - +NTP_AUTOCONF = $(CROSS_AUTOCONF) +NTP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) + # NTP: options, we need lots of options ;-) ifdef PTXCONF_NTP_CLOCKCTL diff --git a/rules/openafs.make b/rules/openafs.make index 4b1653e95..f81f09fc8 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -78,8 +78,7 @@ OPENAFS_ENV = $(CROSS_ENV) # # autoconf # -OPENAFS_AUTOCONF = --build=$(GNU_HOST) -OPENAFS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +OPENAFS_AUTOCONF = $(CROSS_AUTOCONF) OPENAFS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) OPENAFS_AUTOCONF += -enable-tansac-paths OPENAFS_AUTOCONF += --with-afs-sysname=$(OPENAFS_SYS) diff --git a/rules/openssh.make b/rules/openssh.make index c59e70f23..12726c24c 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -133,7 +133,8 @@ OPENSSH_ENV = \ # # autoconf # -OPENSSH_AUTOCONF = \ +OPENSSH_AUTOCONF = $(CROSS_AUTOCONF) +OPENSSH_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ --prefix=/usr \ diff --git a/rules/oprofile.make b/rules/oprofile.make index 9d2b55926..0bda07c04 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -76,10 +76,8 @@ OPROFILE_ENV = $(CROSS_ENV) # # autoconf # -OPROFILE_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -OPROFILE_AUTOCONF += --build=$(GNU_HOST) -OPROFILE_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) - +OPROFILE_AUTOCONF = $(CROSS_AUTOCONF) +OPROFILE_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) OPROFILE_AUTOCONF += --with-kernel-support # # note: we must use here the kernel's makevars (ARCH=fo CROSS_COMPILE=bar) diff --git a/rules/pango12.make b/rules/pango12.make index bb1693e5f..cfb1822ea 100644 --- a/rules/pango12.make +++ b/rules/pango12.make @@ -88,9 +88,8 @@ PANGO12_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -PANGO12_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -PANGO12_AUTOCONF += --build=$(GNU_HOST) -PANGO12_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +PANGO12_AUTOCONF = $(CROSS_AUTOCONF) +PANGO12_AUTOCONF + --prefix=$(CROSS_LIB_DIR) PANGO12_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 PANGO12_AUTOCONF += --enable-explicit-deps diff --git a/rules/pdksh.make b/rules/pdksh.make index 2b3c4a6e9..b4f0834b6 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -57,9 +57,8 @@ $(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get pdksh_prepare: $(STATEDIR)/pdksh.prepare +PDKSH_AUTOCONF = $(CROSS_AUTOCONF) PDKSH_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ --target=$(PTXCONF_GNU_TARGET) \ --disable-sanity-checks \ --prefix=/usr diff --git a/rules/penguzilla.make b/rules/penguzilla.make index 833067471..40ef9c6eb 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -80,9 +80,8 @@ PENGUZILLA_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -PENGUZILLA_AUTOCONF = --prefix=/usr -PENGUZILLA_AUTOCONF += --build=$(GNU_HOST) -PENGUZILLA_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +PENGUZILLA_AUTOCONF = $(CROSS_AUTOCONF) +PENGUZILLA_AUTOCONF += --prefix=/usr PENGUZILLA_AUTOCONF += --with-mozilla=$(MFIREBIRD_DIR) PENGUZILLA_AUTOCONF += --with-gtk-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) diff --git a/rules/procps.make b/rules/procps.make index 89fd17496..da058aa85 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -80,9 +80,8 @@ PROCPS_MAKEVARS += LDFLAGS=-L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib # # autoconf # -PROCPS_AUTOCONF = --prefix=$(CROSS_LIB_DIR) -PROCPS_AUTOCONF += --build=$(GNU_HOST) -PROCPS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +PROCPS_AUTOCONF = $(CROSS_AUTOCONF) +PROCPS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/procps.prepare: $(procps_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/proftpd.make b/rules/proftpd.make index 0673e3799..8d6c562c5 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -62,8 +62,7 @@ $(STATEDIR)/proftpd.extract: $(STATEDIR)/proftpd.get proftpd_prepare: $(STATEDIR)/proftpd.prepare -PROFTPD_AUTOCONF = --build=$(GNU_HOST) -PROFTPD_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +PROFTPD_AUTOCONF = $(CROSS_AUTOCONF) PROFTPD_AUTOCONF += --prefix=/usr PROFTPD_AUTOCONF += --sysconfdir=/etc diff --git a/rules/python.make b/rules/python.make index 3eef393f5..d83baea9a 100644 --- a/rules/python.make +++ b/rules/python.make @@ -77,9 +77,8 @@ python_prepare_deps = \ PYTHON_PATH = PATH=$(CROSS_PATH) PYTHON_ENV = $(CROSS_ENV) -PYTHON_AUTOCONF = --prefix=/usr -PYTHON_AUTOCONF += --build=$(GNU_HOST) -PYTHON_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +PYTHON_AUTOCONF = $(CROSS_AUTOCONF) +PYTHON_AUTOCONF += --prefix=/usr PYTHON_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) PYTHON_MAKEVARS = HOSTPYTHON=$(XCHAIN_PYTHON_BUILDDIR)/python diff --git a/rules/rn.make b/rules/rn.make index aa450829a..0e73291c8 100644 --- a/rules/rn.make +++ b/rules/rn.make @@ -76,10 +76,8 @@ rn_prepare_deps = \ #rn_prepare_deps += $(STATEDIR)/sys-epoll-lib.install #endif -RN_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) +RN_AUTOCONF = $(CROSS_AUTOCONF) +RN_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) RN_MAKEVARS = \ PREFIX=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \ diff --git a/rules/rootfs.in b/rules/rootfs.in index 7ac5f381f..96d666f62 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -94,6 +94,7 @@ config IMAGE_HD config IMAGE_HD_CONF string prompt "Geometry file for hd image" + depends on IMAGE_HD help config IMAGE_JFFS2 diff --git a/rules/rsync.make b/rules/rsync.make index 4838d6d00..6ca3a5a88 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -75,9 +75,8 @@ RSYNC_ENV = rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes $(CROSS_ENV) # # autoconf # -RSYNC_AUTOCONF = --prefix=/usr -RSYNC_AUTOCONF += --build=$(GNU_HOST) -RSYNC_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +RSYNC_AUTOCONF = $(CROSS_AUTOCONF) +RSYNC_AUTOCONF += --prefix=/usr RSYNC_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) RSYNC_AUTOCONF += --with-included-popt diff --git a/rules/rtai.make b/rules/rtai.make index 01e2d9c42..a195cb4ac 100644 --- a/rules/rtai.make +++ b/rules/rtai.make @@ -77,9 +77,8 @@ rtai_prepare_deps = \ $(STATEDIR)/kernel.prepare \ $(STATEDIR)/rtai.extract -RTAI_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +RTAI_AUTOCONF = $(CROSS_AUTOCONF) +RTAI_AUTOCONF += \ --with-kconfig-file=$(RTAI_DIR)/.config \ --with-linux-dir=$(KERNEL_DIR) diff --git a/rules/rtnet.make b/rules/rtnet.make index 9fcded8a8..d9f4f1be7 100644 --- a/rules/rtnet.make +++ b/rules/rtnet.make @@ -79,9 +79,8 @@ RTNET_ENV = $(CROSS_ENV) # # autoconf # -RTNET_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +RTNET_AUTOCONF = $(CROSS_AUTOCONF) +RTNET_AUTOCONF += \ --prefix=$(CROSS_LIB_DIR) \ --with-rtai=$(RTAI_BUILDDIR)/usr/realtime # --with-rtai=$(RTAI_DIR) diff --git a/rules/slang.make b/rules/slang.make index 6fa3d111b..37890a950 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -76,10 +76,8 @@ SLANG_ENV = $(CROSS_ENV) # # autoconf # -SLANG_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +SLANG_AUTOCONF = $(CROSS_AUTOCONF) +SLANG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/slang.prepare: $(slang_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/strace.make b/rules/strace.make index f1b398e78..21f9c8768 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -19,7 +19,7 @@ endif # # Paths and names # -STRACE = strace-4.5.1 +STRACE = strace-4.5.7 STRACE_URL = http://umn.dl.sourceforge.net/sourceforge/strace/$(STRACE).tar.bz2 STRACE_SOURCE = $(SRCDIR)/$(STRACE).tar.bz2 STRACE_DIR = $(BUILDDIR)/$(STRACE) @@ -72,9 +72,8 @@ ifndef PTXCONF_STRACE_SHARED STRACE_ENV = LDFLAGS=-static endif -STRACE_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +STRACE_AUTOCONF = $(CROSS_AUTOCONF) +STRACE_AUTOCONF += \ --target=$(PTXCONF_GNU_TARGET) \ --prefix=/usr \ --disable-sanity-checks diff --git a/rules/sudo.make b/rules/sudo.make index d219b61cd..25e0340c6 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -79,10 +79,8 @@ SUDO_ENV = $(CROSS_ENV) # # autoconf # -SUDO_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +SUDO_AUTOCONF = $(CROSS_AUTOCONF) +SUDO_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/sudo.prepare: $(sudo_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 265f0a005..5b3b09e5e 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -77,10 +77,8 @@ SYSFSUTILS_ENV = $(CROSS_ENV) # # autoconf # -SYSFSUTILS_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +SYSFSUTILS_AUTOCONF = $(CROSS_AUTOCONF) +SYSFSUTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/sysfsutils.prepare: $(sysfsutils_prepare_deps) @$(call targetinfo, $@) @@ -126,7 +124,7 @@ $(STATEDIR)/sysfsutils.targetinstall: $(sysfsutils_targetinstall_deps) @$(call targetinfo, $@) ifdef PTXCONF_SYSFSUTILS_LIB $(call copy_root, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.2, /lib/libsysfs.so.1.0.2) - $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libsysfs.so.1.0.2 + $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/lib/libsysfs.so.1.0.2 $(call link_root, /lib/libsysfs.so.1.0.2, /lib/libsysfs.so.1) $(call link_root, /lib/libsysfs.so.1.0.2, /lib/libsysfs.so) endif diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 5af02b92a..04dca3957 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -79,10 +79,8 @@ TCPDUMP_ENV = $(CROSS_ENV) # # autoconf # -TCPDUMP_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +TCPDUMP_AUTOCONF = $(CROSS_AUTOCONF) +TCPDUMP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) # while cross compiling configure cannot determine kernel version TCPDUMP_AUTOCONF += ac_cv_linux_vers=$(KERNEL_VERSION_MAJOR) diff --git a/rules/termcap.make b/rules/termcap.make index d12f37487..a57cee03a 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -83,10 +83,8 @@ TERMCAP_ENV = $(CROSS_ENV) # # autoconf # -TERMCAP_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +TERMCAP_AUTOCONF = $(CROSS_AUTOCONF) +TERMCAP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/termcap.prepare: $(termcap_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/thttpd.make b/rules/thttpd.make index 45fc74227..9acee68de 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -76,10 +76,8 @@ THTTPD_ENV = $(CROSS_ENV) # # autoconf # -THTTPD_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) +THTTPD_AUTOCONF = $(CROSS_AUTOCONF) +THTTPD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/thttpd.prepare: $(thttpd_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/wxWindows.make b/rules/wxWindows.make index b059e27bc..bc82707cd 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -78,9 +78,8 @@ WXWINDOWS_ENV = $(CROSS_ENV) # # autoconf # -WXWINDOWS_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -WXWINDOWS_AUTOCONF += --build=$(GNU_HOST) -WXWINDOWS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +WXWINDOWS_AUTOCONF = $(CROSS_AUTOCONF) +WXWINDOWS_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) WXWINDOWS_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11 WXWINDOWS_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib WXWINDOWS_AUTOCONF += --disable-shared diff --git a/rules/xalf.make b/rules/xalf.make index a3ca20064..cc21769d2 100644 --- a/rules/xalf.make +++ b/rules/xalf.make @@ -77,9 +77,8 @@ XALF_ENV = $(CROSS_ENV) # # autoconf # -XALF_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) -XALF_AUTOCONF += --build=$(GNU_HOST) -XALF_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) +XALF_AUTOCONF = $(CROSS_AUTOCONF) +XALF_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) #XALF_AUTOCONF += diff --git a/rules/xchain-zlib.make b/rules/xchain-zlib.make index 1d8353ee7..3de002bf5 100644 --- a/rules/xchain-zlib.make +++ b/rules/xchain-zlib.make @@ -55,9 +55,11 @@ $(STATEDIR)/xchain-zlib.prepare: $(STATEDIR)/xchain-zlib.extract # Compile # ---------------------------------------------------------------------------- +xchain-zlib_compile: $(STATEDIR)/xchain-zlib.compile + $(STATEDIR)/xchain-zlib.compile: $(STATEDIR)/xchain-zlib.prepare @$(call targetinfo, $@) - make -C $(XCHAIN_ZLIB_BUILDDIR) $(XCHAIN_ZLIB_MAKEVARS) + cd $(XCHAIN_ZLIB_BUILDDIR) && make $(XCHAIN_ZLIB_MAKEVARS) touch $@ # ---------------------------------------------------------------------------- @@ -68,8 +70,7 @@ xchain-zlib_install: $(STATEDIR)/xchain-zlib.install $(STATEDIR)/xchain-zlib.install: $(STATEDIR)/xchain-zlib.compile @$(call targetinfo, $@) - make -C $(XCHAIN_ZLIB_BUILDDIR) $(XCHAIN_ZLIB_MAKEVARS) \ - install + cd $(XCHAIN_ZLIB_BUILDDIR) && make $(XCHAIN_ZLIB_MAKEVARS) install touch $@ # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/zebra.make b/rules/zebra.make index 081aa2984..2073004ff 100644 --- a/rules/zebra.make +++ b/rules/zebra.make @@ -67,9 +67,8 @@ zebra_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/zebra.extract -ZEBRA_AUTOCONF = \ - --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ +ZEBRA_AUTOCONF = $(CROSS_AUTOCONF) +ZEBRA_AUTOCONF += \ --with-cflags="$(TARGET_CFLAGS)" \ --prefix=/usr \ --exec-prefix=/usr \ |