diff options
Diffstat (limited to 'rules')
189 files changed, 426 insertions, 507 deletions
diff --git a/rules/Rules.make b/rules/Rules.make index 01c30528b..bd63e2301 100644 --- a/rules/Rules.make +++ b/rules/Rules.make @@ -82,6 +82,7 @@ HOSTCC_ENV = CC=$(HOSTCC) # CROSS_LIB_DIR = the libs for the target system are installed into this dir # CROSS_LIB_DIR := $(call remove_quotes,$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)) +SYSROOT := $(call remove_quotes,$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)) # # Use the masquerading method of invoking distcc if enabled @@ -143,8 +144,11 @@ TARGET_LDFLAGS += $(PTXCONF_TARGET_EXTRA_LDFLAGS) ## ifndef $(PTXCONF_CROSSTOOL) TARGET_CXXFLAGS += -isystem $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include +TARGET_CXXFLAGS += -isystem $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/include TARGET_CPPFLAGS += -isystem $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include +TARGET_CPPFLAGS += -isystem $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/include TARGET_LDFLAGS += -L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib +TARGET_LDFLAGS += -L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/lib endif @@ -229,8 +233,17 @@ CROSS_ENV_PROGS := \ $(CROSS_ENV_RANLIB) \ $(CROSS_ENV_STRIP) +# +# prepare to use pkg-config with wrapper which takes care of $(SYSROOT). +# The wrapper's magic doesn't work when pkg-config strips out /usr/lib +# and other system libs/cflags, so we leave them in; the wrapper +# replaces them by proper $(SYSROOT) correspondees. +# + CROSS_ENV_PKG_CONFIG := \ - PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig + SYSROOT=$(SYSROOT) \ + PKG_CONFIG_PATH=$(SYSROOT)/lib/pkgconfig:$(SYSROOT)/usr/lib/pkgconfig \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 CROSS_ENV_FLAGS := \ $(CROSS_ENV_CFLAGS) \ @@ -257,21 +270,54 @@ CROSS_ENV_AC := \ gt_cv_func_gettext_libintl=yes \ ac_cv_sysv_ipc=yes +CROSS_ENV_DESTDIR := \ + DESTDIR=$(SYSROOT) + +# +# We want to use DESTDIR and --prefix=/usr, to get no build paths in our +# binaries. Unfortunately, not all packages support this, especially +# libtool based packets seem to be broken. See for example: +# +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=58664 +# +# for a longer discussion [RSC] +# + +CROSS_AUTOCONF_SYSROOT_USR := \ + $(call remove_quotes,--build=$(GNU_HOST) --host=$(PTXCONF_GNU_TARGET) --prefix=/usr --sysconfdir=/etc) + +CROSS_AUTOCONF_SYSROOT_ROOT := \ + $(call remove_quotes,--build=$(GNU_HOST) --host=$(PTXCONF_GNU_TARGET) --prefix=/) + +CROSS_AUTOCONF_BROKEN_USR := \ + $(call remove_quotes,--build=$(GNU_HOST) --host=$(PTXCONF_GNU_TARGET) --prefix=$(SYSROOT)) + ifndef NATIVE + CROSS_ENV := \ $(CROSS_ENV_PROGS) \ $(CROSS_ENV_FLAGS) \ $(CROSS_ENV_PKG_CONFIG) \ - $(CROSS_ENV_AC) + $(CROSS_ENV_AC) \ + $(CROSS_ENV_DESTDIR) + +CROSS_AUTOCONF_USR := $(CROSS_AUTOCONF_SYSROOT_USR) +CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) -CROSS_AUTOCONF := $(call remove_quotes,--build=$(GNU_HOST) --host=$(PTXCONF_GNU_TARGET)) else + CROSS_ENV := \ $(CROSS_ENV_PROGS) \ $(CROSS_ENV_FLAGS) \ - $(CROSS_ENV_PKG_CONFIG) + $(CROSS_ENV_PKG_CONFIG) \ + $(CROSS_ENV_DESTDIR) + +CROSS_AUTOCONF_USR := +CROSS_AUTOCONF_ROOT := + endif +HOST_AUTOCONF := --prefix=$(PTXCONF_HOST_PREFIX) # ---------------------------------------------------------------------------- # Convenience macros @@ -660,15 +706,39 @@ get_option_ext = \ # # $1: label of the packet # $2: optional: alternative directory +# $3: optional: "h" = install as a host tool # +# FIXME: if we don't use --install=no we can make one packet. +# +ifdef PTXCONF_IMAGE_HOST_DEB install = \ - DIR="$($(strip $(1)_DIR))"; \ - BUILDDIR="$($(strip $(1)_BUILDDIR))"; \ - BUILDDIR="$${BUILDDIR:-$$DIR}"; \ - [ "$(strip $(2))" != "" ] && BUILDDIR="$(strip $(2))"; \ + BUILDDIR="$($(strip $(1)_DIR))"; \ + DESTDIR="$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)"; \ + [ "$(2)" != "" ] && BUILDDIR="$(strip $(2))"; \ + [ "$(3)" = "h" ] && unset DESTDIR; \ cd $$BUILDDIR && \ - $($(strip $(1)_ENV)) $($(strip $(1)_PATH)) \ - $(CHECKINSTALL) make install $($(strip $(1)_MAKEVARS)) + $($(strip $(1)_ENV)) \ + $($(strip $(1)_PATH)) \ + INSTALLWATCH_PREFIX=$(PTXCONF_PREFIX) \ + $(HOST_CHECKINSTALL_DIR)/checkinstall \ + -D -y -pakdir=$(IMAGEDIR) --install=no -nodoc \ + make install \ + $($(strip $(1)_MAKEVARS)) \ + DESTDIR=$$DESTDIR; \ + #dpkg-deb -x blablabla $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +else +install = \ + BUILDDIR="$($(strip $(1)_DIR))"; \ + DESTDIR="$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)"; \ + [ "$(2)" != "" ] && BUILDDIR="$(strip $(2))"; \ + [ "$(3)" = "h" ] && unset DESTDIR; \ + cd $$BUILDDIR && \ + $($(strip $(1)_ENV)) \ + $($(strip $(1)_PATH)) \ + make install \ + $($(strip $(1)_MAKEVARS)) \ + DESTDIR=$$DESTDIR; +endif # @@ -972,6 +1042,7 @@ install_copy = \ echo "Error: install_copy failed!"; \ exit -1; \ fi; \ + mkdir -p $(IMAGEDIR); \ echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(IMAGEDIR)/permissions; \ else \ echo "install_copy:"; \ @@ -1003,6 +1074,7 @@ install_copy = \ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)$$DST; \ ;; \ esac; \ + mkdir -p $(IMAGEDIR); \ echo "f:$$DST:$$OWN:$$GRP:$$PER" >> $(IMAGEDIR)/permissions; \ fi @@ -1055,6 +1127,7 @@ install_copy_toolchain_lib = \ fi; \ ;; \ esac; \ + mkdir -p $(IMAGEDIR); \ echo "f:$${DST}/$${LIB}:0:0:755" >> $(IMAGEDIR)/permissions; \ else \ echo "error: found $${LIB}, but no file or link"; \ @@ -1127,6 +1200,7 @@ install_copy_toolchain_dl = \ fi; \ ;; \ esac; \ + mkdir -p $(IMAGEDIR); \ echo "f:$${DST}/$${LIB}:0:0:755" >> $(IMAGEDIR)/permissions; \ else \ exit -1; \ @@ -1186,6 +1260,7 @@ install_node = \ echo " major=$$MAJ"; \ echo " minor=$$MIN"; \ echo " name=$$DEV"; \ + mkdir -p $(IMAGEDIR); \ echo "n:$$DEV:$$OWN:$$GRP:$$PER:$$TYP:$$MAJ:$$MIN" >> $(IMAGEDIR)/permissions # @@ -1238,7 +1313,7 @@ install_finish = \ if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ echo -n "install_finish: writing ipkg packet ... "; \ (echo "pushd $(IMAGEDIR)/ipkg;"; $(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions; echo "popd;"; \ - echo "$(PTXCONF_HOST_PREFIX)/bin/ipkg-build $(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) $(IMAGEDIR)/ipkg $(IMAGEDIR)") |\ + echo "$(PTXCONF_HOST_PREFIX)/usr/bin/ipkg-build $(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) $(IMAGEDIR)/ipkg $(IMAGEDIR)") |\ $(FAKEROOT) -- 2>&1 | grep -v "cannot access" | grep -v "No such file or directory"; \ rm -fr $(IMAGEDIR)/ipkg; \ echo "done."; \ diff --git a/rules/apache.make b/rules/apache.make index 705e2df21..cefe8d5da 100644 --- a/rules/apache.make +++ b/rules/apache.make @@ -82,8 +82,6 @@ APACHE_ENV = \ # FIXME: RSC: add more config options # APACHE_AUTOCONF = \ - --prefix=$(CROSS_LIB_DIR) \ - --sysconfdir=/etc \ --disable-module=access \ --disable-module=asis \ --disable-module=autoindex \ diff --git a/rules/apache2.make b/rules/apache2.make index f100ce0dc..481ae2868 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -81,8 +81,7 @@ APACHE2_ENV += ac_cv_func_setpgrp_void=yes # # autoconf # -APACHE2_AUTOCONF = $(CROSS_AUTOCONF) -APACHE2_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +APACHE2_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/apache2.prepare: $(apache2_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/at-spi.make b/rules/at-spi.make index cf6bd5779..02cab6a5f 100644 --- a/rules/at-spi.make +++ b/rules/at-spi.make @@ -75,8 +75,7 @@ AT-SPI_ENV = $(CROSS_ENV) # # autoconf # -AT-SPI_AUTOCONF = $(CROSS_AUTOCONF) -AT-SPI_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +AT-SPI_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/atk124.make b/rules/atk124.make index b9979faed..fde06315f 100644 --- a/rules/atk124.make +++ b/rules/atk124.make @@ -78,8 +78,7 @@ ATK_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -ATK_AUTOCONF = $(CROSS_AUTOCONF) -ATK_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +ATK_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/atk.prepare: $(atk_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make index 674e07749..f0061b460 100644 --- a/rules/autoconf-2.13.make +++ b/rules/autoconf-2.13.make @@ -59,6 +59,7 @@ AUTOCONF213_ENV = $(HOSTCC_ENV) $(STATEDIR)/autoconf213.prepare: $(STATEDIR)/autoconf213.extract @$(call targetinfo, $@) + # FIXME FIXME FIXME cd $(AUTOCONF213_DIR) && \ $(AUTOCONF213_ENV) \ ./configure --prefix=$(PTXCONF_PREFIX)/$(AUTOCONF213) diff --git a/rules/autoconf-2.57.make b/rules/autoconf-2.57.make index ba9f63c63..38ecfee50 100644 --- a/rules/autoconf-2.57.make +++ b/rules/autoconf-2.57.make @@ -59,6 +59,7 @@ AUTOCONF257_ENV = $(HOSTCC_ENV) $(STATEDIR)/autoconf257.prepare: $(STATEDIR)/autoconf257.extract @$(call targetinfo, $@) + # FIXME FIXME FIXME cd $(AUTOCONF257_DIR) && \ $(AUTOCONF257_ENV) \ ./configure --prefix=$(PTXCONF_PREFIX)/$(AUTOCONF257) diff --git a/rules/automake-1.5.make b/rules/automake-1.5.make index 52f1b5334..e98c365f3 100644 --- a/rules/automake-1.5.make +++ b/rules/automake-1.5.make @@ -69,6 +69,7 @@ AUTOMAKE15_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$(CROSS_PATH) # # autoconf # +# FIXME FIXME FIXME AUTOMAKE15_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(AUTOMAKE15) $(STATEDIR)/automake15.prepare: $(automake15_prepare_deps) diff --git a/rules/automake-1.7.6.make b/rules/automake-1.7.6.make index 719443653..978339375 100644 --- a/rules/automake-1.7.6.make +++ b/rules/automake-1.7.6.make @@ -69,6 +69,7 @@ AUTOMAKE176_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$(CROSS_PATH) # # autoconf # +# FIXME FIXME FIXME AUTOMAKE176_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(AUTOMAKE176) $(STATEDIR)/automake176.prepare: $(automake176_prepare_deps) diff --git a/rules/bash.make b/rules/bash.make index 59d22852e..a4cb12d25 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -63,11 +63,12 @@ $(STATEDIR)/bash.extract: $(STATEDIR)/bash.get bash_prepare: $(STATEDIR)/bash.prepare -BASH_AUTOCONF = $(CROSS_AUTOCONF) +BASH_AUTOCONF = $(CROSS_AUTOCONF_USR) BASH_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) BASH_AUTOCONF += --disable-sanity-checks -BASH_AUTOCONF += --prefix=/usr --bindir=/bin -BASH_PATH = PATH=$(CROSS_PATH) +BASH_AUTOCONF += --prefix=/usr +BASH_AUTOCONF += --bindir=/bin +BASH_PATH = $(CROSS_PATH) BASH_ENV = ac_cv_func_setvbuf_reversed=no bash_cv_have_mbstate_t=yes BASH_ENV += $(CROSS_ENV) diff --git a/rules/betaftpd.make b/rules/betaftpd.make index 412dc5408..b887a79b7 100644 --- a/rules/betaftpd.make +++ b/rules/betaftpd.make @@ -76,8 +76,7 @@ BETAFTPD_ENV = $(CROSS_ENV) # # autoconf # -BETAFTPD_AUTOCONF = $(CROSS_AUTOCONF) -BETAFTPD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) \ +BETAFTPD_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/betaftpd.prepare: $(betaftpd_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bind.make b/rules/bind.make index ad211aaae..01fb850a9 100644 --- a/rules/bind.make +++ b/rules/bind.make @@ -74,8 +74,7 @@ BIND_ENV = $(CROSS_ENV) # # autoconf # -BIND_AUTOCONF = $(CROSS_AUTOCONF) -BIND_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BIND_AUTOCONF = $(CROSS_AUTOCONF_USR) BIND_AUTOCONF += --with-randomdev=/dev/random ifdef PTXCONF_BIND_THREADS diff --git a/rules/binutils.make b/rules/binutils.make index 757238cfe..a78f2a1e5 100644 --- a/rules/binutils.make +++ b/rules/binutils.make @@ -67,11 +67,10 @@ binutils_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/binutils.extract -BINUTILS_AUTOCONF = $(CROSS_AUTOCONF) +BINUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) BINUTILS_AUTOCONF += \ --target=$(PTXCONF_GNU_TARGET) \ --enable-targets=$(PTXCONF_GNU_TARGET) \ - --prefix=/usr \ --disable-nls \ --enable-shared \ --enable-commonbfdlib \ diff --git a/rules/blackbox.make b/rules/blackbox.make index b3d263b42..0e95c9cba 100644 --- a/rules/blackbox.make +++ b/rules/blackbox.make @@ -74,8 +74,7 @@ BLACKBOX_ENV = $(CROSS_ENV) # # autoconf # -BLACKBOX_AUTOCONF = $(CROSS_AUTOCONF) -BLACKBOX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BLACKBOX_AUTOCONF = $(CROSS_AUTOCONF_USR) BLACKBOX_AUTOCONF += -disable-nls BLACKBOX_AUTOCONF += --x-includes=/home/koan/ptxdist/ptxdist-testing/root/usr/X11R6/include diff --git a/rules/bluez-libs.make b/rules/bluez-libs.make index e5e4917f0..71ea2fa80 100644 --- a/rules/bluez-libs.make +++ b/rules/bluez-libs.make @@ -75,8 +75,7 @@ BLUEZ_LIBS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -BLUEZ_LIBS_AUTOCONF = $(CROSS_AUTOCONF) -BLUEZ_LIBS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BLUEZ_LIBS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/bluez-libs.prepare: $(bluez-libs_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bluez-utils.make b/rules/bluez-utils.make index cdd6bb5a2..ea2d22cf6 100644 --- a/rules/bluez-utils.make +++ b/rules/bluez-utils.make @@ -76,8 +76,7 @@ BLUEZ_UTILS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -BLUEZ_UTILS_AUTOCONF = $(CROSS_AUTOCONF) -BLUEZ_UTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BLUEZ_UTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/bluez-utils.prepare: $(bluez-utils_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 5d466d17d..2e8ed4f24 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -75,8 +75,7 @@ BONNIEXX_ENV = $(CROSS_ENV) # # autoconf # -BONNIEXX_AUTOCONF = $(CROSS_AUTOCONF) -BONNIEXX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BONNIEXX_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/bonniexx.prepare: $(bonniexx_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make index adb561b5d..c7c8d063a 100644 --- a/rules/bridge-utils.make +++ b/rules/bridge-utils.make @@ -77,8 +77,7 @@ BRIDGE_UTILS_ENV = $(CROSS_ENV) # # autoconf # -BRIDGE_UTILS_AUTOCONF = $(CROSS_AUTOCONF) -BRIDGE_UTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +BRIDGE_UTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/bridge-utils.prepare: $(bridge-utils_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/canutils.make b/rules/canutils.make index 2aed79d08..324f88b62 100644 --- a/rules/canutils.make +++ b/rules/canutils.make @@ -76,8 +76,7 @@ CANUTILS_ENV = $(CROSS_ENV) # # autoconf # -CANUTILS_AUTOCONF = $(CROSS_AUTOCONF) -CANUTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +CANUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/canutils.prepare: $(canutils_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/cfgsh.make b/rules/cfgsh.make index 18cfa0fab..d7d68fb83 100644 --- a/rules/cfgsh.make +++ b/rules/cfgsh.make @@ -80,7 +80,6 @@ CFGSH_ENV = $(CROSS_ENV) CFGSH_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/cfgsh.prepare: $(cfgsh_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/check_tools.make b/rules/check_tools.make index 7872e2aca..e670abe6b 100644 --- a/rules/check_tools.make +++ b/rules/check_tools.make @@ -1,5 +1,12 @@ # -*-makefile-*- -check_tools: check_dirs + +check_tools_deps = check_dirs +check_tools_deps += $(STATEDIR)/host-pkg-config-wrapper.install +ifdef $(PTXCONF_IMAGE_IPKG) +check_tools_deps += $(STATEDIR)/host-ipkg-utils.install +endif + +check_tools: $(check_tools_deps) @echo "running check_tools..." @@ -8,6 +15,7 @@ check_tools: check_dirs $(call check_prog_exists, awk) $(call check_prog_exists, perl) $(call check_prog_exists, wget) + $(call check_prog_exists, pkg-config) # # check if some programs are installed in the right version $(call check_prog_version, wget, -V, 1\\\\.(9|1.?)\\\\.|1\\\\.9\\\\+cvs) diff --git a/rules/chrony.make b/rules/chrony.make index b3366ab9d..219a2416f 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -75,8 +75,7 @@ CHRONY_ENV = $(CROSS_ENV) # # autoconf # -CHRONY_AUTOCONF = $(CROSS_AUTOCONF) -CHRONY_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +CHRONY_AUTOCONF = $(CROSS_AUTOCONF_USR) CHRONY_AUTOCONF += --disable-readline $(STATEDIR)/chrony.prepare: $(chrony_prepare_deps) diff --git a/rules/coreutils.make b/rules/coreutils.make index 359b75287..ab63996c4 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -56,7 +56,7 @@ $(STATEDIR)/coreutils.extract: $(STATEDIR)/coreutils.get coreutils_prepare: $(STATEDIR)/coreutils.prepare -COREUTILS_AUTOCONF = $(CROSS_AUTOCONF) +COREUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) COREUTILS_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) COREUTILS_AUTOCONF += --disable-nls diff --git a/rules/cppunit.make b/rules/cppunit.make index 1c405bed0..3bc564c33 100644 --- a/rules/cppunit.make +++ b/rules/cppunit.make @@ -76,7 +76,7 @@ CPPUNIT_ENV = $(CROSS_ENV) # # autoconf # -CPPUNIT_AUTOCONF = $(CROSS_AUTOCONF) +CPPUNIT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/cppunit.prepare: $(cppunit_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/crosstool.make b/rules/crosstool.make index d6e255c78..7877416a7 100644 --- a/rules/crosstool.make +++ b/rules/crosstool.make @@ -119,36 +119,27 @@ CROSSTOOL_ENV = export ptx_http_proxy=$(PTXCONF_SETUP_HTTP_PROXY); \ export ptx_ftp_proxy=$(PTXCONF_SETUP_FTP_PROXY); \ eval export \ $${ptx_http_proxy:+http_proxy=$${ptx_http_proxy}} \ - $${ptx_ftp_proxy:+ftp_proxy=$${ptx_ftp_proxy}}; \ - \ - TARBALLS_DIR=$(SRCDIR) \ - RESULT_TOP=$(call remove_quotes,$(PTXCONF_PREFIX)) \ - GCC_LANGUAGES="$(CROSSTOOL_GCCLANG)" \ - KERNELCONFIG=$(call remove_quotes,$(CROSSTOOL_DIR)/$(PTXCONF_CROSSTOOL_KERNELCONFIG)) \ - TARGET=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) \ - TARGET_CFLAGS="$(call remove_quotes,$(CROSSTOOL_TARGET_CFLAGS))" \ - GCC_EXTRA_CONFIG=$(CROSSTOOL_GCC_EXTRA_CONFIG) \ - GLIBC_EXTRA_CONFIG=$(CROSSTOOL_GLIBC_EXTRA_CONFIG) \ - BINUTILS_DIR=binutils-$(PTXCONF_BINUTILS_VERSION) \ - GCC_DIR=gcc-$(GCC_VERSION) \ - LIBC_DIR=$(CROSSTOOL_LIBC_DIR) \ - C_LIBRARY=$(CROSSTOOL_LIBC) \ - LINUX_DIR=linux-$(KERNEL_VERSION) \ - GLIBCTHREADS_FILENAME=glibc-linuxthreads-$(GLIBC_VERSION) + $${ptx_ftp_proxy:+ftp_proxy=$${ptx_ftp_proxy}}; +CROSSTOOL_ENV += TARBALLS_DIR=$(SRCDIR) +CROSSTOOL_ENV += RESULT_TOP=$(call remove_quotes,$(PTXCONF_PREFIX)) +CROSSTOOL_ENV += GCC_LANGUAGES="$(CROSSTOOL_GCCLANG)" +CROSSTOOL_ENV += KERNELCONFIG=$(call remove_quotes,$(CROSSTOOL_DIR)/$(PTXCONF_CROSSTOOL_KERNELCONFIG)) +CROSSTOOL_ENV += TARGET=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) +CROSSTOOL_ENV += TARGET_CFLAGS="$(call remove_quotes,$(CROSSTOOL_TARGET_CFLAGS))" +CROSSTOOL_ENV += GCC_EXTRA_CONFIG=$(CROSSTOOL_GCC_EXTRA_CONFIG) +CROSSTOOL_ENV += GLIBC_EXTRA_CONFIG=$(CROSSTOOL_GLIBC_EXTRA_CONFIG) +CROSSTOOL_ENV += BINUTILS_DIR=binutils-$(PTXCONF_BINUTILS_VERSION) +CROSSTOOL_ENV += GCC_DIR=gcc-$(GCC_VERSION) +CROSSTOOL_ENV += LIBC_DIR=$(CROSSTOOL_LIBC_DIR) +CROSSTOOL_ENV += C_LIBRARY=$(CROSSTOOL_LIBC) ifdef PTXCONF_UCLIBC CROSSTOOL_ENV += UCLIBCCONFIG=$(CROSSTOOL_DIR)/uclibc_config endif +CROSSTOOL_ENV += LINUX_DIR=linux-$(KERNEL_VERSION) +CROSSTOOL_ENV += GLIBCTHREADS_FILENAME=glibc-linuxthreads-$(GLIBC_VERSION) $(STATEDIR)/crosstool.prepare: $(crosstool_prepare_deps) @$(call targetinfo, $@) - mkdir -p $(call remove_quotes, $(PTXCONF_PREFIX)) - ( \ - cd $(CROSSTOOL_DIR); \ - set -ex; \ - $(CROSSTOOL_ENV) sh $(CROSSTOOL_DIR)/all.sh --nobuild --notest; \ - echo "done" \ - exit 1; \ - ) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -164,10 +155,6 @@ crosstool_compile: $(STATEDIR)/crosstool.compile $(STATEDIR)/crosstool.compile: $(STATEDIR)/crosstool.prepare @$(call targetinfo, $@) -ifdef PTXCONF_UCLIBC - grep -e PTXCONF_UC_ $(PTXDIST_WORKSPACE)/.config > $(CROSSTOOL_DIR)/uclibc_config - perl -i -p -e 's/PTXCONF_UC_//g' $(CROSSTOOL_DIR)/uclibc_config -endif @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -180,15 +167,20 @@ crosstool_install_deps = $(STATEDIR)/crosstool.compile $(STATEDIR)/crosstool.install: $(crosstool_install_deps) @$(call targetinfo, $@) +ifdef PTXCONF_UCLIBC + grep -e PTXCONF_UC_ $(PTXDIST_WORKSPACE)/.config > $(CROSSTOOL_DIR)/uclibc_config + perl -i -p -e 's/PTXCONF_UC_//g' $(CROSSTOOL_DIR)/uclibc_config +endif + # # We set all the stuff crosstool expects in it's environment # - ( \ - cd $(CROSSTOOL_DIR); \ - set -ex; \ - $(CROSSTOOL_ENV) sh $(CROSSTOOL_DIR)/all.sh --nounpack --notest; \ - echo "done" \ - exit 1; \ + ( cd $(CROSSTOOL_DIR); \ + set -ex; \ + mkdir -p $(call remove_quotes,$(PTXCONF_PREFIX)); \ + $(CROSSTOOL_ENV) sh $(CROSSTOOL_DIR)/all.sh --notest; \ + echo "done" \ + exit 1; \ ) ifdef PTXCONF_CROSSTOOL_VERSION_0_32 touch $(call remove_quotes,$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/gcc-$(GCC_VERSION)-$(CROSSTOOL_LIBC_DIR)/$(PTXCONF_GNU_TARGET)/include/linux/autoconf.h) diff --git a/rules/cyclictest.make b/rules/cyclictest.make index baea9d390..856838f0d 100644 --- a/rules/cyclictest.make +++ b/rules/cyclictest.make @@ -77,8 +77,7 @@ CYCLICTEST_ENV = $(CROSS_ENV) # # autoconf # -#CYCLICTEST_AUTOCONF = $(CROSS_AUTOCONF) -#CYCLICTEST_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +#CYCLICTEST_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/cyclictest.prepare: $(cyclictest_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/db41.make b/rules/db41.make index a6a66023e..9acf05b9d 100644 --- a/rules/db41.make +++ b/rules/db41.make @@ -73,8 +73,7 @@ DB41_ENV = $(CROSS_ENV) # # autoconf # -DB41_AUTOCONF = $(CROSS_AUTOCONF) -DB41_AUTOCONF = --prefix=$(CROSS_LIB_DIR) +DB41_AUTOCONF = $(CROSS_AUTOCONF_USR) DB41_AUTOCONF += --enable-cxx $(STATEDIR)/db41.prepare: $(db41_prepare_deps) diff --git a/rules/dbench.make b/rules/dbench.make index 3061c9801..b65098b01 100644 --- a/rules/dbench.make +++ b/rules/dbench.make @@ -75,8 +75,7 @@ DBENCH_ENV = $(CROSS_ENV) # # autoconf # -DBENCH_AUTOCONF = $(CROSS_AUTOCONF) -DBENCH_AUTOCONF += --prefix=$(PTXCONF_TESTSUITE_DIR)/$(DBENCH) +DBENCH_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/dbench.prepare: $(dbench_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/dialog.make b/rules/dialog.make index 7b7337dc4..a4a409213 100644 --- a/rules/dialog.make +++ b/rules/dialog.make @@ -75,8 +75,7 @@ DIALOG_ENV = $(CROSS_ENV) # # autoconf # -DIALOG_AUTOCONF = $(CROSS_AUTOCONF) -DIALOG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +DIALOG_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/dialog.prepare: $(dialog_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/diffutils.make b/rules/diffutils.make index 2b3a1d4ae..a2c9f382b 100644 --- a/rules/diffutils.make +++ b/rules/diffutils.make @@ -75,8 +75,7 @@ DIFFUTILS_ENV = $(CROSS_ENV) # # autoconf # -DIFFUTILS_AUTOCONF = $(CROSS_AUTOCONF) -DIFFUTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +DIFFUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/diffutils.prepare: $(diffutils_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/dropbear.make b/rules/dropbear.make index 6c96358dc..c1698aca9 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -78,8 +78,7 @@ DROPBEAR_ENV = $(CROSS_ENV) # # autoconf # -DROPBEAR_AUTOCONF = $(CROSS_AUTOCONF) -DROPBEAR_AUTOCONF += --prefix=/usr +DROPBEAR_AUTOCONF = $(CROSS_AUTOCONF_USR) DROPBEAR_AUTOCONF += --disable-nls ifdef PTXCONF_DROPBEAR_DIS_ZLIB diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 73f6afc1a..80664ae5e 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -60,8 +60,7 @@ $(STATEDIR)/e2fsprogs.extract: $(STATEDIR)/e2fsprogs.get e2fsprogs_prepare: $(STATEDIR)/e2fsprogs.prepare -E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) -E2FSPROGS_AUTOCONF += --prefix=/usr +E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF_USR) E2FSPROGS_AUTOCONF += --enable-fsck ifndef NATIVE E2FSPROGS_AUTOCONF += --with-cc=$(COMPILER_PREFIX)gcc diff --git a/rules/e2tools.make b/rules/e2tools.make index 2fb39170b..5ee0d17d2 100644 --- a/rules/e2tools.make +++ b/rules/e2tools.make @@ -77,7 +77,6 @@ HOSTTOOL_E2TOOLS_ENV = $(CROSS_ENV) # autoconf # HOSTTOOL_E2TOOLS_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX) \ --build=$(GNU_HOST) --host=$(GNU_HOST) --target=$(GNU_HOST) diff --git a/rules/efax.make b/rules/efax.make index 88bb11133..8c89c3e5d 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -75,8 +75,7 @@ EFAX_ENV = $(CROSS_ENV) # # autoconf # -EFAX_AUTOCONF = $(CROSS_AUTOCONF) -EFAX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +EFAX_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/efax.prepare: $(efax_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/ethereal.make b/rules/ethereal.make index 96bde62e5..9dfb39ade 100644 --- a/rules/ethereal.make +++ b/rules/ethereal.make @@ -75,8 +75,7 @@ ETHEREAL_ENV = $(CROSS_ENV) # # autoconf # -ETHEREAL_AUTOCONF = $(CROSS_AUTOCONF) -ETHEREAL_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +ETHEREAL_AUTOCONF = $(CROSS_AUTOCONF_USR) ETHEREAL_AUTOCONF += --disable-usr-local ETHEREAL_AUTOCONF += --disable-threads diff --git a/rules/expat.make b/rules/expat.make index 95f32ce0c..a27639269 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -53,6 +53,7 @@ $(STATEDIR)/expat.extract: $(expat_extract_deps) @$(call targetinfo, $@) @$(call clean, $(EXPAT_DIR)) @$(call extract, $(EXPAT_SOURCE)) + @$(call patchin, $(EXPAT)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -74,8 +75,7 @@ EXPAT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -EXPAT_AUTOCONF = $(CROSS_AUTOCONF) -EXPAT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +EXPAT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/expat.prepare: $(expat_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/flash.make b/rules/flash.make index 3a4976147..21b8d2e46 100644 --- a/rules/flash.make +++ b/rules/flash.make @@ -93,8 +93,7 @@ FLASH_ENV = $(CROSS_ENV) # # autoconf # -FLASH_AUTOCONF = $(CROSS_AUTOCONF) -FLASH_AUTOCONF += --prefix=/usr +FLASH_AUTOCONF = $(CROSS_AUTOCONF_USR) FLASH_AUTOCONF += --with-ncurses-path=$(NCURSES_DIR) $(STATEDIR)/flash.prepare: $(flash_prepare_deps) diff --git a/rules/flex.make b/rules/flex.make index 26b547456..16d6f85e9 100644 --- a/rules/flex.make +++ b/rules/flex.make @@ -75,8 +75,7 @@ FLEX_ENV = $(CROSS_ENV) # # autoconf # -FLEX_AUTOCONF = $(CROSS_AUTOCONF) -FLEX_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +FLEX_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/flex.prepare: $(flex_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/fltk.make b/rules/fltk.make index 19aaa671a..78320a54c 100644 --- a/rules/fltk.make +++ b/rules/fltk.make @@ -74,8 +74,7 @@ FLTK_ENV = $(CROSS_ENV) # # autoconf # -FLTK_AUTOCONF = $(CROSS_AUTOCONF) -FLTK_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +FLTK_AUTOCONF = $(CROSS_AUTOCONF_USR) FLTK_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include 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 cf36da5d6..0aacf9372 100644 --- a/rules/fontconfig22.make +++ b/rules/fontconfig22.make @@ -87,9 +87,7 @@ FONTCONFIG22_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -FONTCONFIG22_AUTOCONF = $(CROSS_AUTOCONF) -FONTCONFIG22_AUTOCONF = --prefix=$(CROSS_LIB_DIR) - +FONTCONFIG22_AUTOCONF = $(CROSS_AUTOCONF_USR) FONTCONFIG22_AUTOCONF += --disable-docs FONTCONFIG22_AUTOCONF += --with-expat-lib=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib FONTCONFIG22_AUTOCONF += --with-expat-include=$(PTXCONF_PREFIX)/include diff --git a/rules/freetype.make b/rules/freetype.make index 5545381cd..ffcda1fd2 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -80,8 +80,7 @@ FREETYPE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -FREETYPE_AUTOCONF = $(CROSS_AUTOCONF) -FREETYPE_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +FREETYPE_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/freetype.prepare: $(freetype_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gail.make b/rules/gail.make index 2bd69c81d..57e737a3e 100644 --- a/rules/gail.make +++ b/rules/gail.make @@ -75,8 +75,7 @@ GAIL_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -GAIL_AUTOCONF = $(CROSS_AUTOCONF) -GAIL_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +GAIL_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/gail.prepare: $(gail_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gawk.make b/rules/gawk.make index cff65aa65..c0223b414 100644 --- a/rules/gawk.make +++ b/rules/gawk.make @@ -75,8 +75,7 @@ GAWK_ENV = $(CROSS_ENV) # # autoconf # -GAWK_AUTOCONF = $(CROSS_AUTOCONF) -GAWK_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +GAWK_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/gawk.prepare: $(gawk_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gdb.make b/rules/gdb.make index 73e38f25b..f415d156a 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -100,10 +100,9 @@ endif # autoconf # GDB_AUTOCONF = \ - $(CROSS_AUTOCONF) \ + $(CROSS_AUTOCONF_USR) \ --target=$(call remove_quotes,$(PTXCONF_GNU_TARGET)) \ - --enable-serial-configure \ - --prefix=/usr + --enable-serial-configure $(STATEDIR)/gdb.prepare: $(gdb_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gettext.make b/rules/gettext.make index 577f6d7d9..0ba36ae15 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -80,8 +80,7 @@ GETTEXT_ENV = $(CROSS_ENV) \ # autoconf # -GETTEXT_AUTOCONF = $(CROSS_AUTOCONF) -GETTEXT_AUTOCONF += --prefix=/usr +GETTEXT_AUTOCONF = $(CROSS_AUTOCONF_USR) # This is braindead but correct :-) No, it isn't! # GETTEXT_AUTOCONF += --disable-nls diff --git a/rules/glib1210.make b/rules/glib1210.make index 3362700a0..36466d88a 100644 --- a/rules/glib1210.make +++ b/rules/glib1210.make @@ -90,9 +90,7 @@ GLIB1210_ENV = $(CROSS_ENV) # # autoconf # -GLIB1210_AUTOCONF = $(CROSS_AUTOCONF) -GLIB1210_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) - +GLIB1210_AUTOCONF = $(CROSS_AUTOCONF_USR) GLIB1210_AUTOCONF += --with-threads=posix $(STATEDIR)/glib1210.prepare: $(glib1210_prepare_deps) diff --git a/rules/glib22.make b/rules/glib22.make index 57887797d..9b5030148 100644 --- a/rules/glib22.make +++ b/rules/glib22.make @@ -84,9 +84,7 @@ GLIB22_ENV += glib_cv_stack_grows=no # # autoconf # -GLIB22_AUTOCONF = $(CROSS_AUTOCONF) -GLIB22_AUTOCONF += --prefix=$(CROSS_LIB_DIR) - +GLIB22_AUTOCONF = $(CROSS_AUTOCONF_USR) GLIB22_AUTOCONF += --with-threads=posix $(STATEDIR)/glib22.prepare: $(glib22_prepare_deps) diff --git a/rules/glib26.make b/rules/glib26.make index 4c77d4864..1fa1682b4 100644 --- a/rules/glib26.make +++ b/rules/glib26.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_GLIB26) += glib26 # # Paths and names # -GLIB26_VERSION = 2.6.1 +GLIB26_VERSION = 2.6.6 GLIB26 = glib-$(GLIB26_VERSION) GLIB26_SUFFIX = tar.gz GLIB26_URL = ftp://ftp.gtk.org/pub/gtk/v2.6/$(GLIB26).$(GLIB26_SUFFIX) @@ -64,30 +64,29 @@ glib26_prepare: $(STATEDIR)/glib26.prepare # # dependencies # -glib26_prepare_deps = \ +glib26_prepare_deps = \ $(STATEDIR)/glib26.extract \ $(STATEDIR)/virtual-xchain.install -GLIB26_PATH = PATH=$(CROSS_PATH) -GLIB26_ENV = $(CROSS_ENV) -GLIB26_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ +GLIB26_PATH = PATH=$(CROSS_PATH) +GLIB26_ENV = \ + $(CROSS_ENV) \ + glib_cv_use_pid_surrogate=no \ + ac_cv_func_posix_getpwuid_r=yes \ + glib_cv_stack_grows=no -GLIB26_ENV += glib_cv_use_pid_surrogate=no -GLIB26_ENV += ac_cv_func_posix_getpwuid_r=yes -ifeq (y, $G(PTXCONF_GLIBC_DL)) -GLIB26_ENV += glib_cv_uscore=yes +ifdef $(PTXCONF_GLIBC_DL) +GLIB26_ENV += glib_cv_uscore=yes else -GLIB26_ENV += glib_cv_uscore=no +GLIB26_ENV += glib_cv_uscore=no endif -GLIB26_ENV += glib_cv_stack_grows=no # # autoconf # -GLIB26_AUTOCONF = $(CROSS_AUTOCONF) -GLIB26_AUTOCONF += --prefix=$(CROSS_LIB_DIR) - -GLIB26_AUTOCONF += --with-threads=posix +GLIB26_AUTOCONF = \ + $(CROSS_AUTOCONF_USR) \ + --with-threads=posix $(STATEDIR)/glib26.prepare: $(glib26_prepare_deps) @$(call targetinfo, $@) @@ -144,7 +143,7 @@ $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps) @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0.600.1) @$(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0) @$(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so) - + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0.600.1) @$(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0) @$(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so) @@ -152,7 +151,7 @@ $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps) @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0.600.1) @$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0) @$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so) - + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0.600.1) @$(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0) @$(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so) diff --git a/rules/gmp3.make b/rules/gmp3.make index 9c4d211c4..4a7eb1e0d 100644 --- a/rules/gmp3.make +++ b/rules/gmp3.make @@ -62,8 +62,7 @@ gmp3_prepare_deps = \ GMP3_PATH = PATH=$(CROSS_PATH) GMP3_ENV = $(CROSS_ENV) -GMP3_AUTOCONF = $(CROSS_AUTOCONF) -GMP3_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +GMP3_AUTOCONF = $(CROSS_AUTOCONF_USR) GMP3_AUTOCONF += --enable-shared GMP3_AUTOCONF += --enable-static diff --git a/rules/gnupg.make b/rules/gnupg.make index 75c164d3f..770909956 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -75,8 +75,7 @@ GNUPG_ENV = $(CROSS_ENV) # # autoconf # -GNUPG_AUTOCONF = $(CROSS_AUTOCONF) -GNUPG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) \ +GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \ --disable-card-support \ --disable-gnupg-iconv \ --disable-exec \ diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 9cd3a408c..6d23f01b4 100644 --- a/rules/gnuplot.make +++ b/rules/gnuplot.make @@ -79,9 +79,7 @@ GNUPLOT_ENV += LIBPNG_CONFIG=$(CROSS_LIB_DIR)/bin/libpng-config # # autoconf # -GNUPLOT_AUTOCONF = $(CROSS_AUTOCONF) -GNUPLOT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) - +GNUPLOT_AUTOCONF = $(CROSS_AUTOCONF_USR) GNUPLOT_AUTOCONF += --disable-history-file GNUPLOT_AUTOCONF += --disable-mouse GNUPLOT_AUTOCONF += --disable-pm3d diff --git a/rules/grub.make b/rules/grub.make index cd20e5dde..dcff1da17 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -64,10 +64,10 @@ GRUB_PATH = PATH=$(CROSS_PATH) GRUB_ENV = $(CROSS_ENV) CFLAGS='' -GRUB_AUTOCONF = $(CROSS_AUTOCONF) +GRUB_AUTOCONF = $(CROSS_AUTOCONF_USR) GRUB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) - -GRUB_AUTOCONF += --prefix=$(PTXCONF_PREFIX) +# FIXME FIXME FIXME +GRUB_AUTOCONF += --prefix=$(PTXCONF_PREFIX) ifneq ("", "$(PTXCONF_GRUB_PRESET_MENU)") GRUB_AUTOCONF += --enable-preset-menu=$(PTXCONF_GRUB_PRESET_MENU) diff --git a/rules/gtk1210.make b/rules/gtk1210.make index 8de750ef2..b332f8d67 100644 --- a/rules/gtk1210.make +++ b/rules/gtk1210.make @@ -77,9 +77,7 @@ GTK1210_ENV += ac_cv_have_x='have_x=yes ac_x_includes=$(PTXCONF_PREFIX)/$(PTXCON # # autoconf # -GTK1210_AUTOCONF = $(CROSS_AUTOCONF) -GTK1210_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) - +GTK1210_AUTOCONF = $(CROSS_AUTOCONF_USR) GTK1210_AUTOCONF += --with-threads=posix GTK1210_AUTOCONF += --with-glib-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) GTK1210_AUTOCONF += --with-x diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make index 1d7b37661..9e27466ad 100644 --- a/rules/gtk2-engines.make +++ b/rules/gtk2-engines.make @@ -75,8 +75,7 @@ GTK2-ENGINES_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -GTK2-ENGINES_AUTOCONF = $(CROSS_AUTOCONF) -GTK2-ENGINES_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +GTK2-ENGINES_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/gtk2-engines.prepare: $(gtk2-engines_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/gtk22.make b/rules/gtk22.make index c0b65c7c8..98a119e15 100644 --- a/rules/gtk22.make +++ b/rules/gtk22.make @@ -82,8 +82,7 @@ GTK22_ENV += FREETYPE_CONFIG="pkg-config freetype2" # # autoconf # -GTK22_AUTOCONF = $(CROSS_AUTOCONF) -GTK22_AUTOCONF = --prefix=$(CROSS_LIB_DIR) +GTK22_AUTOCONF = $(CROSS_AUTOCONF_USR) GTK22_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 # FIXME GTK22_AUTOCONF += --without-libtiff diff --git a/rules/hdparm.make b/rules/hdparm.make index afe5d80b5..c4be64959 100644 --- a/rules/hdparm.make +++ b/rules/hdparm.make @@ -76,8 +76,7 @@ HDPARM_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -HDPARM_AUTOCONF = $(CROSS_AUTOCONF) -HDPARM_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +HDPARM_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/hdparm.prepare: $(hdparm_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/hexedit.make b/rules/hexedit.make index 863bbe9ac..5d4b99192 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -79,8 +79,7 @@ HEXEDIT_ENV += CFLAGS='$(strip $(subst $(quote),,$(TARGET_CFLAGS))) $(strip $(su # # autoconf # -HEXEDIT_AUTOCONF = $(CROSS_AUTOCONF) -HEXEDIT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +HEXEDIT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/hexedit.prepare: $(hexedit_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/host-apache2.make b/rules/host-apache2.make index f4bc6208d..41b04430a 100644 --- a/rules/host-apache2.make +++ b/rules/host-apache2.make @@ -69,9 +69,7 @@ HOST_APACHE2_ENV = $(HOSTCC_ENV) # # autoconf # -HOST_APACHE2_AUTOCONF = --prefix=$(PTXCONF_PREFIX) -HOST_APACHE2_AUTOCONF += --build=$(GNU_HOST) -HOST_APACHE2_AUTOCONF += --host=$(GNU_HOST) +HOST_APACHE2_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/host-apache2.prepare: $(host-apache2_prepare_deps) @$(call targetinfo, $@) @@ -107,7 +105,7 @@ host-apache2_install_deps = $(STATEDIR)/host-apache2.compile $(STATEDIR)/host-apache2.install: $(host-apache2_install_deps) @$(call targetinfo, $@) # FIXME - #@$(call install, HOST-APACHE2) + #@$(call install, HOST-APACHE2,,h) # cd $(HOST_APACHE2_DIR) && $(HOST_APACHE2_ENV) $(HOST_APACHE2_PATH) $(MAKE_INSTALL) @$(call touch, $@) diff --git a/rules/host-checkinstall.make b/rules/host-checkinstall.make index 75774308e..038478a4c 100644 --- a/rules/host-checkinstall.make +++ b/rules/host-checkinstall.make @@ -74,9 +74,7 @@ HOST_CHECKINSTALL_ENV = $(HOSTCC_ENV) # # autoconf # -HOST_CHECKINSTALL_AUTOCONF = --prefix=$(PTXCONF_PREFIX) -HOST_CHECKINSTALL_AUTOCONF += --build=$(GNU_HOST) -HOST_CHECKINSTALL_AUTOCONF += --host=$(GNU_HOST) +HOST_CHECKINSTALL_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/host-checkinstall.prepare: $(host-checkinstall_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in index 07f7f497c..de76688e7 100644 --- a/rules/host-e2fsprogs.in +++ b/rules/host-e2fsprogs.in @@ -1,14 +1,14 @@ -config HOSTTOOL_E2FSPROGS +config HOST_E2FSPROGS bool prompt "e2fsprogs" -config HOSTTOOL_E2FSPROGS_TUNE2FS +config HOST_E2FSPROGS_TUNE2FS bool prompt "Install tune2fs" - depends on HOSTTOOL_E2FSPROGS + depends on HOST_E2FSPROGS -config HOSTTOOL_E2FSPROGS_RESIZE2FS +config HOST_E2FSPROGS_RESIZE2FS bool prompt "Install resize2fs" - depends on HOSTTOOL_E2FSPROGS + depends on HOST_E2FSPROGS diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make index eff58a29b..bdedc14a8 100644 --- a/rules/host-e2fsprogs.make +++ b/rules/host-e2fsprogs.make @@ -12,86 +12,85 @@ # # We provide this package # -HOST_PACKAGES-$(PTXCONF_HOSTTOOL_E2FSPROGS) += hosttool-e2fsprogs +HOST_PACKAGES-$(PTXCONF_HOST_E2FSPROGS) += host-e2fsprogs # # Paths and names # -HOSTTOOL_E2FSPROGS_VERSION = 1.35 -HOSTTOOL_E2FSPROGS = e2fsprogs-$(HOSTTOOL_E2FSPROGS_VERSION) -HOSTTOOL_E2FSPROGS_SUFFIX = tar.gz -HOSTTOOL_E2FSPROGS_URL = $(PTXCONF_SETUP_SFMIRROR)/e2fsprogs/$(HOSTTOOL_E2FSPROGS).$(HOSTTOOL_E2FSPROGS_SUFFIX) -HOSTTOOL_E2FSPROGS_SOURCE_DIR = $(SRCDIR)/hosttool/ -HOSTTOOL_E2FSPROGS_SOURCE = $(HOSTTOOL_E2FSPROGS_SOURCE_DIR)/$(HOSTTOOL_E2FSPROGS).$(HOSTTOOL_E2FSPROGS_SUFFIX) -HOSTTOOL_E2FSPROGS_DIR = $(BUILDDIR)/hosttool/$(HOSTTOOL_E2FSPROGS) -HOSTTOOL_E2FSPROGS_BUILD_DIR = $(BUILDDIR)/hosttool/$(HOSTTOOL_E2FSPROGS)-build +HOST_E2FSPROGS_VERSION = 1.35 +HOST_E2FSPROGS = e2fsprogs-$(HOST_E2FSPROGS_VERSION) +HOST_E2FSPROGS_SUFFIX = tar.gz +HOST_E2FSPROGS_URL = $(PTXCONF_SETUP_SFMIRROR)/e2fsprogs/$(HOST_E2FSPROGS).$(HOST_E2FSPROGS_SUFFIX) +HOST_E2FSPROGS_SOURCE_DIR = $(SRCDIR)/host/ +HOST_E2FSPROGS_SOURCE = $(HOST_E2FSPROGS_SOURCE_DIR)/$(HOST_E2FSPROGS).$(HOST_E2FSPROGS_SUFFIX) +HOST_E2FSPROGS_DIR = $(BUILDDIR)/host/$(HOST_E2FSPROGS) +HOST_E2FSPROGS_BUILD_DIR = $(BUILDDIR)/host/$(HOST_E2FSPROGS)-build # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_get: $(STATEDIR)/hosttool-e2fsprogs.get +host-e2fsprogs_get: $(STATEDIR)/host-e2fsprogs.get -$(STATEDIR)/hosttool-e2fsprogs.get: $(HOSTTOOL_E2FSPROGS_SOURCE) +$(STATEDIR)/host-e2fsprogs.get: $(HOST_E2FSPROGS_SOURCE) @$(call targetinfo, $@) - @$(call get_patches, $(HOSTTOOL_E2FSPROGS)) + @$(call get_patches, $(HOST_E2FSPROGS)) @$(call touch, $@) -$(HOSTTOOL_E2FSPROGS_SOURCE): +$(HOST_E2FSPROGS_SOURCE): @$(call targetinfo, $@) - @$(call get, $(HOSTTOOL_E2FSPROGS_URL), $(HOSTTOOL_E2FSPROGS_SOURCE_DIR) ) + @$(call get, $(HOST_E2FSPROGS_URL), $(HOST_E2FSPROGS_SOURCE_DIR) ) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_extract: $(STATEDIR)/hosttool-e2fsprogs.extract +host-e2fsprogs_extract: $(STATEDIR)/host-e2fsprogs.extract -$(STATEDIR)/hosttool-e2fsprogs.extract: $(STATEDIR)/hosttool-e2fsprogs.get +$(STATEDIR)/host-e2fsprogs.extract: $(STATEDIR)/host-e2fsprogs.get @$(call targetinfo, $@) - @$(call clean, $(HOSTTOOL_E2FSPROGS_DIR)) - @$(call extract, $(HOSTTOOL_E2FSPROGS_SOURCE) , $(BUILDDIR)/hosttool/ ) - @$(call patchin, $(HOSTTOOL_E2FSPROGS), $(HOSTTOOL_E2FSPROGS_DIR) ) - chmod +w $(HOSTTOOL_E2FSPROGS_DIR)/po/*.po + @$(call clean, $(HOST_E2FSPROGS_DIR)) + @$(call extract, $(HOST_E2FSPROGS_SOURCE) , $(BUILDDIR)/host/ ) + @$(call patchin, $(HOST_E2FSPROGS), $(HOST_E2FSPROGS_DIR) ) + chmod +w $(HOST_E2FSPROGS_DIR)/po/*.po @$(call touch, $@) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_prepare: $(STATEDIR)/hosttool-e2fsprogs.prepare +host-e2fsprogs_prepare: $(STATEDIR)/host-e2fsprogs.prepare -# FIXME - doesn't seem to be a hosttool... -HOSTTOOL_E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) -HOSTTOOL_E2FSPROGS_AUTOCONF += --prefix=/usr -HOSTTOOL_E2FSPROGS_AUTOCONF += --enable-fsck -HOSTTOOL_E2FSPROGS_AUTOCONF += --with-cc=$(COMPILER_PREFIX)gcc -HOSTTOOL_E2FSPROGS_AUTOCONF += --with-linker=$(COMPILER_PREFIX)ld -HOSTTOOL_E2FSPROGS_PATH = PATH=$(CROSS_PATH) -HOSTTOOL_E2FSPROGS_ENV = $(CROSS_ENV) -HOSTTOOL_E2FSPROGS_ENV += BUILD_CC=$(HOSTCC) +# FIXME - doesn't seem to be a host... +HOST_E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF_USR) +HOST_E2FSPROGS_AUTOCONF += --enable-fsck +HOST_E2FSPROGS_AUTOCONF += --with-cc=$(COMPILER_PREFIX)gcc +HOST_E2FSPROGS_AUTOCONF += --with-linker=$(COMPILER_PREFIX)ld +HOST_E2FSPROGS_PATH = PATH=$(CROSS_PATH) +HOST_E2FSPROGS_ENV = $(CROSS_ENV) +HOST_E2FSPROGS_ENV += BUILD_CC=$(HOSTCC) -hosttool-e2fsprogs_prepare_deps = \ +host-e2fsprogs_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/hosttool-e2fsprogs.extract + $(STATEDIR)/host-e2fsprogs.extract -$(STATEDIR)/hosttool-e2fsprogs.prepare: $(hosttool-e2fsprogs_prepare_deps) +$(STATEDIR)/host-e2fsprogs.prepare: $(host-e2fsprogs_prepare_deps) @$(call targetinfo, $@) - mkdir -p $(HOSTTOOL_E2FSPROGS_BUILD_DIR) && \ - cd $(HOSTTOOL_E2FSPROGS_BUILD_DIR) && \ - $(HOSTTOOL_E2FSPROGS_PATH) $(HOSTTOOL_E2FSPROGS_ENV) \ - $(HOSTTOOL_E2FSPROGS_DIR)/configure $(HOSTTOOL_E2FSPROGS_AUTOCONF) + mkdir -p $(HOST_E2FSPROGS_BUILD_DIR) && \ + cd $(HOST_E2FSPROGS_BUILD_DIR) && \ + $(HOST_E2FSPROGS_PATH) $(HOST_E2FSPROGS_ENV) \ + $(HOST_E2FSPROGS_DIR)/configure $(HOST_E2FSPROGS_AUTOCONF) @$(call touch, $@) # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_compile: $(STATEDIR)/hosttool-e2fsprogs.compile +host-e2fsprogs_compile: $(STATEDIR)/host-e2fsprogs.compile -hosttool-e2fsprogs_compile_deps = $(STATEDIR)/hosttool-e2fsprogs.prepare +host-e2fsprogs_compile_deps = $(STATEDIR)/host-e2fsprogs.prepare -$(STATEDIR)/hosttool-e2fsprogs.compile: $(hosttool-e2fsprogs_compile_deps) +$(STATEDIR)/host-e2fsprogs.compile: $(host-e2fsprogs_compile_deps) @$(call targetinfo, $@) # # in the util dir are tools that are compiled for the host system @@ -100,17 +99,17 @@ $(STATEDIR)/hosttool-e2fsprogs.compile: $(hosttool-e2fsprogs_compile_deps) # it's not good to pass target CFLAGS to the host compiler :) # so override these # - $(HOSTTOOL_E2FSPROGS_PATH) make -C $(HOSTTOOL_E2FSPROGS_BUILD_DIR)/util - $(HOSTTOOL_E2FSPROGS_PATH) make -C $(HOSTTOOL_E2FSPROGS_BUILD_DIR) + $(HOST_E2FSPROGS_PATH) make -C $(HOST_E2FSPROGS_BUILD_DIR)/util + $(HOST_E2FSPROGS_PATH) make -C $(HOST_E2FSPROGS_BUILD_DIR) @$(call touch, $@) # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_install: $(STATEDIR)/hosttool-e2fsprogs.install +host-e2fsprogs_install: $(STATEDIR)/host-e2fsprogs.install -$(STATEDIR)/hosttool-e2fsprogs.install: +$(STATEDIR)/host-e2fsprogs.install: @$(call targetinfo, $@) @$(call touch, $@) @@ -118,16 +117,16 @@ $(STATEDIR)/hosttool-e2fsprogs.install: # Hosttool Install # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_targetinstall: $(STATEDIR)/hosttool-e2fsprogs.targetinstall +host-e2fsprogs_targetinstall: $(STATEDIR)/host-e2fsprogs.targetinstall -$(STATEDIR)/hosttool-e2fsprogs.targetinstall: $(STATEDIR)/hosttool-e2fsprogs.compile +$(STATEDIR)/host-e2fsprogs.targetinstall: $(STATEDIR)/host-e2fsprogs.compile @$(call targetinfo, $@) mkdir -p $(ROOTDIR)/sbin -ifdef PTXCONF_HOSTTOOL_E2FSPROGS_TUNE2FS - install -D $(HOSTTOOL_E2FSPROGS_BUILD_DIR)/misc/tune2fs $(PTXCONF_PREFIX)/sbin/tune2fs +ifdef PTXCONF_HOST_E2FSPROGS_TUNE2FS + install -D $(HOST_E2FSPROGS_BUILD_DIR)/misc/tune2fs $(PTXCONF_PREFIX)/sbin/tune2fs endif -ifdef PTXCONF_HOSTTOOL_E2FSPROGS_RESIZE2FS - install -D $(HOSTTOOL_E2FSPROGS_BUILD_DIR)/resize/resize2fs $(PTXCONF_PREFIX)/sbin/resize2fs +ifdef PTXCONF_HOST_E2FSPROGS_RESIZE2FS + install -D $(HOST_E2FSPROGS_BUILD_DIR)/resize/resize2fs $(PTXCONF_PREFIX)/sbin/resize2fs endif @$(call touch, $@) @@ -135,7 +134,7 @@ endif # Clean # ---------------------------------------------------------------------------- -hosttool-e2fsprogs_clean: - rm -rf $(STATEDIR)/hosttool-e2fsprogs.* $(HOSTTOOL_E2FSPROGS_DIR) $(HOSTTOOL_E2FSPROGS_BUILD_DIR) +host-e2fsprogs_clean: + rm -rf $(STATEDIR)/host-e2fsprogs.* $(HOST_E2FSPROGS_DIR) $(HOST_E2FSPROGS_BUILD_DIR) # vim: syntax=make diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index 63b35c170..aa3660605 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -68,16 +68,11 @@ hosttool-fakeroot_prepare_deps = \ HOSTTOOL_FAKEROOT_PATH = PATH=$(CROSS_PATH) HOSTTOOL_FAKEROOT_ENV = $(HOSTCC_ENV) -#HOSTTOOL_FAKEROOT_ENV += # # autoconf # -HOSTTOOL_FAKEROOT_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX) \ - --build=$(GNU_HOST) - --host=$(GNU_HOST) - --target=$(GNU_HOST) +HOSTTOOL_FAKEROOT_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/hosttool-fakeroot.prepare: $(hosttool-fakeroot_prepare_deps) @$(call targetinfo, $@) @@ -108,7 +103,7 @@ hosttool-fakeroot_install: $(STATEDIR)/hosttool-fakeroot.install $(STATEDIR)/hosttool-fakeroot.install: $(STATEDIR)/hosttool-fakeroot.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_FAKEROOT) + @$(call install, HOSTTOOL_FAKEROOT,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-flex254.make b/rules/host-flex254.make index e787b87b1..a725a28bf 100644 --- a/rules/host-flex254.make +++ b/rules/host-flex254.make @@ -61,11 +61,9 @@ HOSTTOOL_FLEX254_PATH = PATH=$(CROSS_PATH) HOSTTOOL_FLEX254_ENV = $(HOSTCC_ENV) # -# autoconf +# autoconf, but without automake :-( # -HOSTTOOL_FLEX254_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX) \ - --build=$(GNU_HOST) +HOSTTOOL_FLEX254_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/usr $(STATEDIR)/hosttool-flex254.prepare: $(hosttool-flex254_prepare_deps) @$(call targetinfo, $@) @@ -96,7 +94,7 @@ hosttool-flex254_install: $(STATEDIR)/hosttool-flex254.install $(STATEDIR)/hosttool-flex254.install: $(STATEDIR)/hosttool-flex254.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_FLEX254) + @$(call install, HOSTTOOL_FLEX254,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make index 2a30b78fe..9a96565e3 100644 --- a/rules/host-genext2fs.make +++ b/rules/host-genext2fs.make @@ -93,11 +93,11 @@ hosttool-genext2fs_install_deps = $(STATEDIR)/hosttool-genext2fs.compile $(STATEDIR)/hosttool-genext2fs.install: $(hosttool-genext2fs_install_deps) @$(call targetinfo, $@) - install -d $(PTXCONF_HOST_PREFIX)/bin/ - install -d $(PTXCONF_HOST_PREFIX)/man/man8/ - - install -m 755 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs $(PTXCONF_HOST_PREFIX)/bin/ - install -m 644 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs.8 $(PTXCONF_HOST_PREFIX)/man/man8/ + install -d $(PTXCONF_HOST_PREFIX)/usr/bin/ + install -d $(PTXCONF_HOST_PREFIX)/usr/man/man8/ + # FIXME: correct path? + install -m 755 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs $(PTXCONF_HOST_PREFIX)/usr/bin/ + install -m 644 $(HOSTTOOL_GENEXT2FS_DIR)/genext2fs.8 $(PTXCONF_HOST_PREFIX)/usr/man/man8/ @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index 991b486d0..1e56f0d67 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOSTTOOL_IPKG_UTILS) += hosttool-ipkg-utils # # Paths and names # -HOSTTOOL-IPKG-UTILS_VERSION = 050831 +HOSTTOOL-IPKG-UTILS_VERSION = 1.7 HOSTTOOL-IPKG-UTILS = ipkg-utils-$(HOSTTOOL-IPKG-UTILS_VERSION) HOSTTOOL-IPKG-UTILS_SUFFIX = tar.gz HOSTTOOL-IPKG-UTILS_URL = ftp://ftp.handhelds.org/packages/ipkg-utils/$(HOSTTOOL-IPKG-UTILS).$(HOSTTOOL-IPKG-UTILS_SUFFIX) @@ -54,9 +54,9 @@ $(STATEDIR)/hosttool-ipkg-utils.extract: $(hosttool-ipkg-utils_extract_deps) @$(call clean, $(HOSTTOOL-IPKG-UTILS_DIR)) @$(call extract, $(HOSTTOOL-IPKG-UTILS_SOURCE), $(HOST_BUILDDIR)) @$(call patchin, $(HOSTTOOL-IPKG-UTILS), $(HOSTTOOL-IPKG-UTILS_DIR)) - perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_PREFIX),g" \ + perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_HOST_PREFIX)/usr,g" \ $(HOSTTOOL-IPKG-UTILS_DIR)/Makefile - perl -i -p -e "s,^ python setup.py install, python setup.py install --prefix=$(PTXCONF_PREFIX),g" \ + perl -i -p -e "s,^ python setup.py install, python setup.py install --prefix=$(PTXCONF_HOST_PREFIX)/usr,g" \ $(HOSTTOOL-IPKG-UTILS_DIR)/Makefile @$(call touch, $@) @@ -100,13 +100,12 @@ hosttool-ipkg-utils_install: $(STATEDIR)/hosttool-ipkg-utils.install $(STATEDIR)/hosttool-ipkg-utils.install: $(STATEDIR)/hosttool-ipkg-utils.compile @$(call targetinfo, $@) - mkdir -p $(PTXCONF_PREFIX)/bin + mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin # ipkg.py is forgotten by MAKE_INSTALL, so we copy it manually # FIXME: this should probably be fixed upstream - cd $(HOSTTOOL-IPKG-UTILS_DIR) && (\ - $(HOSTTOOL-IPKG-UTILS_ENV) $(HOSTTOOL-IPKG-UTILS_PATH) $(MAKE_INSTALL) ;\ - cp -f ipkg.py $(PTXCONF_PREFIX)/bin/;\ - ) + @$(call install, HOSTTOOL-IPKG-UTILS,,h) + mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin + cp -f $(HOSTTOOL-IPKG-UTILS_DIR)/ipkg.py $(PTXCONF_HOST_PREFIX)/usr/bin/ @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-ipkg.in b/rules/host-ipkg.in index 821d78f20..8c3127154 100644 --- a/rules/host-ipkg.in +++ b/rules/host-ipkg.in @@ -6,7 +6,7 @@ config HOSTTOOL_IPKG ipkg is used on the development host to install packets into some directory. Example: - ipkg-cl -o . --force-depends -f $ROOT/etc/ipkg.conf install foo.ipk + ipkg-cl -o . --force-depends -f ../projects/generic/etc/ipkg.conf install foo.ipk config HOSTTOOL_IPKG_EXTRACT_TEST diff --git a/rules/host-ipkg.make b/rules/host-ipkg.make index bac2cc6fd..a9a2e29a8 100644 --- a/rules/host-ipkg.make +++ b/rules/host-ipkg.make @@ -72,10 +72,7 @@ HOSTTOOL_IPKG_ENV = $(HOSTCC_ENV) # # autoconf # -HOSTTOOL_IPKG_AUTOCONF = --prefix=$(PTXCONF_PREFIX) -HOSTTOOL_IPKG_AUTOCONF += --build=$(GNU_HOST) -HOSTTOOL_IPKG_AUTOCONF += --host=$(GNU_HOST) -HOSTTOOL_IPKG_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) +HOSTTOOL_IPKG_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/hosttool-ipkg.prepare: $(hosttool-ipkg_prepare_deps) @$(call targetinfo, $@) @@ -106,7 +103,7 @@ hosttool-ipkg_install: $(STATEDIR)/hosttool-ipkg.install $(STATEDIR)/hosttool-ipkg.install: $(STATEDIR)/hosttool-ipkg.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_IPKG) + @$(call install, HOSTTOOL_IPKG,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-mknbi.make b/rules/host-mknbi.make index f106b9f21..9f13fb1f9 100644 --- a/rules/host-mknbi.make +++ b/rules/host-mknbi.make @@ -66,7 +66,6 @@ hosttool-mknbi_prepare: $(STATEDIR)/hosttool-mknbi.prepare # dependencies # hosttool-mknbi_prepare_deps = $(STATEDIR)/hosttool-mknbi.extract -#hosttool-mknbi_prepare_deps += $(STATEDIR)/hosttool-zlib.install HOSTTOOL_MKNBI_MAKEVARS = CC=$(HOSTCC) HOSTTOOL_MKNBI_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include PREFIX=$(PTXCONF_PREFIX)/usr/local diff --git a/rules/host-module-init-tools.make b/rules/host-module-init-tools.make index 610a008c1..65961778a 100644 --- a/rules/host-module-init-tools.make +++ b/rules/host-module-init-tools.make @@ -59,11 +59,7 @@ hosttool-module-init-tools_prepare_deps = $(STATEDIR)/hosttool-module-init-tools HOSTTOOL_MODULE_INIT_TOOLS_PATH = PATH=$(CROSS_PATH) HOSTTOOL_MODULE_INIT_TOOLS_ENV = $(HOSTCC_ENV) HOSTTOOL_MODULE_INIT_TOOLS_MAKEVARS = MAN5='' -HOSTTOOL_MODULE_INIT_TOOLS_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX) \ - --build=$(GNU_HOST) \ - --host=$(GNU_HOST) \ - --target=$(PTXCONF_GNU_TARGET) +HOSTTOOL_MODULE_INIT_TOOLS_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/hosttool-module-init-tools.prepare: $(hosttool-module-init-tools_prepare_deps) @$(call targetinfo, $@) @@ -100,7 +96,7 @@ endif $(STATEDIR)/hosttool-module-init-tools.install: $(hosttool-module-init-tools_install_deps) @$(call targetinfo, $@) - @$(call install, HOSTTOOL_MODULE_INIT_TOOLS) + @$(call install, HOSTTOOL_MODULE_INIT_TOOLS,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-modutils.make b/rules/host-modutils.make index b2240cea9..0b9e9902a 100644 --- a/rules/host-modutils.make +++ b/rules/host-modutils.make @@ -75,11 +75,7 @@ HOSTTOOL_MODUTILS_ENV = CC=$(HOSTCC) # # autoconf # -HOSTTOOL_MODUTILS_AUTOCONF = \ - --prefix=$(PTXCONF_PREFIX) \ - --build=$(GNU_HOST) \ - --host=$(GNU_HOST) \ - --target=$(PTXCONF_GNU_TARGET) +HOSTTOOL_MODUTILS_AUTOCONF = $(HOST_AUTOCONF) $(STATEDIR)/hosttool-modutils.prepare: $(hosttool-modutils_prepare_deps) @$(call targetinfo, $@) @@ -111,7 +107,8 @@ hosttool-modutils_install: $(STATEDIR)/hosttool-modutils.install $(STATEDIR)/hosttool-modutils.install: $(STATEDIR)/hosttool-modutils.compile @$(call targetinfo, $@) - +# FIXME +# @$(call install, HOSTTOOL_MODUTILS,,h) mkdir -p $(PTXCONF_PREFIX)/bin install -D -m755 $(HOSTTOOL_MODUTILS_DIR)/insmod/insmod \ $(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-insmod.old diff --git a/rules/host-qte.make b/rules/host-qte.make index 48f7a36d1..45ad9efa2 100644 --- a/rules/host-qte.make +++ b/rules/host-qte.make @@ -95,7 +95,7 @@ HOST_QTE_CONF += -no-libjpeg HOST_QTE_CONF += -no-thread HOST_QTE_CONF += -no-cups HOST_QTE_CONF += -no-stl -QTE_AUTOCONF += -no-qvfb +QTE_AUTOCONF += -no-qvfb $(STATEDIR)/host-qte.prepare: $(host-qte_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/host-slirp.make b/rules/host-slirp.make index 947e1fda6..00b7d10de 100644 --- a/rules/host-slirp.make +++ b/rules/host-slirp.make @@ -68,15 +68,14 @@ host-slirp_prepare: $(STATEDIR)/host-slirp.prepare host-slirp_prepare_deps = \ $(STATEDIR)/host-slirp.extract -HOST_SLIRP_PATH = PATH=$(HOST_PATH) -HOST_SLIRP_ENV = $(HOSTCC_ENV) +HOST_SLIRP_PATH = PATH=$(HOST_PATH) +HOST_SLIRP_ENV = $(HOSTCC_ENV) # # autoconf # -HOST_SLIRP_AUTOCONF = --prefix=$(PTXCONF_PREFIX) -HOST_SLIRP_AUTOCONF += --build=$(GNU_HOST) -HOST_SLIRP_AUTOCONF += --host=$(GNU_HOST) +HOST_SLIRP_AUTOCONF = $(HOST_AUTOCONF) +HOST_SLIRP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/usr $(STATEDIR)/host-slirp.prepare: $(host-slirp_prepare_deps) @$(call targetinfo, $@) @@ -109,7 +108,9 @@ host-slirp_install_deps = $(STATEDIR)/host-slirp.compile $(STATEDIR)/host-slirp.install: $(host-slirp_install_deps) @$(call targetinfo, $@) - @$(call install, HOST_SLIRP) + mkdir -p $(PTXCONF_PREFIX)/usr/bin + mkdir -p $(PTXCONF_PREFIX)/usr/man/man1 + @$(call install, HOST_SLIRP, $(HOST_SLIRP_DIR)/src ,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-termcap.make b/rules/host-termcap.make index 18ac37faf..290a1d84d 100644 --- a/rules/host-termcap.make +++ b/rules/host-termcap.make @@ -67,11 +67,10 @@ HOST_TERMCAP_PATH = PATH=$(HOST_PATH) HOST_TERMCAP_ENV = $(HOSTCC_ENV) # -# autoconf +# autoconf without automake :-( # -HOST_TERMCAP_AUTOCONF = --prefix=$(PTXCONF_PREFIX) -HOST_TERMCAP_AUTOCONF += --build=$(GNU_HOST) -HOST_TERMCAP_AUTOCONF += --host=$(GNU_HOST) +HOST_TERMCAP_AUTOCONF = $(HOST_AUTOCONF) +HOST_TERMCAP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/usr $(STATEDIR)/host-termcap.prepare: $(host-termcap_prepare_deps) @$(call targetinfo, $@) @@ -104,7 +103,7 @@ host-termcap_install_deps = $(STATEDIR)/host-termcap.compile $(STATEDIR)/host-termcap.install: $(host-termcap_install_deps) @$(call targetinfo, $@) - @$(call install, HOST_TERMCAP) + @$(call install, HOST_TERMCAP,,h) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 3a4ecf84d..969c3068b 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -21,7 +21,7 @@ HOSTTOOL_UMKIMAGE = u-boot-mkimage-$(HOSTTOOL_UMKIMAGE_VERSION) HOSTTOOL_UMKIMAGE_SUFFIX = tar.gz HOSTTOOL_UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOSTTOOL_UMKIMAGE).$(HOSTTOOL_UMKIMAGE_SUFFIX) HOSTTOOL_UMKIMAGE_SOURCE = $(SRCDIR)/$(HOSTTOOL_UMKIMAGE).$(HOSTTOOL_UMKIMAGE_SUFFIX) -HOSTTOOL_UMKIMAGE_DIR = $(BUILDDIR)/$(HOSTTOOL_UMKIMAGE) +HOSTTOOL_UMKIMAGE_DIR = $(HOST_BUILDDIR)/$(HOSTTOOL_UMKIMAGE) # ---------------------------------------------------------------------------- # Get @@ -50,7 +50,7 @@ hosttool-umkimage_extract_deps = $(STATEDIR)/hosttool-umkimage.get $(STATEDIR)/hosttool-umkimage.extract: $(hosttool-umkimage_extract_deps) @$(call targetinfo, $@) @$(call clean, $(HOSTTOOL_UMKIMAGE_DIR)) - @$(call extract, $(HOSTTOOL_UMKIMAGE_SOURCE)) + @$(call extract, $(HOSTTOOL_UMKIMAGE_SOURCE), $(HOST_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -93,7 +93,8 @@ hosttool-umkimage_install: $(STATEDIR)/hosttool-umkimage.install $(STATEDIR)/hosttool-umkimage.install: $(STATEDIR)/hosttool-umkimage.compile @$(call targetinfo, $@) - mkdir -p $(PTXCONF_PREFIX)/bin + # FIXME + mkdir -p $(PTXCONF_PREFIX)/usr/bin install $(HOSTTOOL_UMKIMAGE_DIR)/mkimage $(PTXCONF_PREFIX)/bin/u-boot-mkimage @$(call touch, $@) diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index 2a5ed62a6..f3d591ad0 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -13,10 +13,9 @@ # Paths and names # -# FIXME: RSC: check if this is correct HOSTPACKAGES-$(HOSTTOOL_UTIL-LINUX) += hosttool-util-linux -HOSTTOOL_UTIL-LINUX_DIR = $(BUILDDIR)/hosttool/$(UTIL-LINUX) +HOSTTOOL_UTIL-LINUX_DIR = $(HOST_BUILDDIR)/$(UTIL-LINUX) # ---------------------------------------------------------------------------- # Hosttool Extract @@ -29,8 +28,8 @@ hosttool-util-linux_extract_deps = $(STATEDIR)/util-linux.get $(STATEDIR)/hosttool-util-linux.extract: $(hosttool-util-linux_extract_deps) @$(call targetinfo, $@) @$(call clean, $(UTIL-LINUX_DIR)) - @$(call extract, $(UTIL-LINUX_SOURCE), $(BUILDDIR)/hosttool) - @$(call patchin, $(UTIL-LINUX)) + @$(call extract, $(UTIL-LINUX_SOURCE), $(HOST_BUILDDIR)) + @$(call patchin, $(UTIL-LINUX),$(HOSTTOOL_UTIL-LINUX_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -82,6 +81,8 @@ hosttool-util-linux_install: $(STATEDIR)/hosttool-util-linux.install $(STATEDIR)/hosttool-util-linux.install: $(STATEDIR)/hosttool-util-linux.compile @$(call targetinfo, $@) + # FIXME: packetize + ifdef PTXCONF_UTLNX_SFDISK install -D $(HOSTTOOL_UTIL-LINUX_DIR)/fdisk/sfdisk \ $(PTXCONF_PREFIX)/sbin/sfdisk diff --git a/rules/host-zlib.make b/rules/host-zlib.make index c06895b38..d0b8341d5 100644 --- a/rules/host-zlib.make +++ b/rules/host-zlib.make @@ -43,8 +43,12 @@ $(STATEDIR)/hosttool-zlib.extract: $(STATEDIR)/hosttool-zlib.get hosttool-zlib_prepare: $(STATEDIR)/hosttool-zlib.prepare -HOSTTOOL_ZLIB_AUTOCONF = --shared -HOSTTOOL_ZLIB_AUTOCONF += --prefix=$(PTXCONF_PREFIX) +# +# autoconf without automake :-( +# + +HOSTTOOL_ZLIB_AUTOCONF = --prefix=$(PTXCONF_HOST_PREFIX)/usr +HOSTTOOL_ZLIB_AUTOCOHF += --shared HOSTTOOL_ZLIB_MAKEVARS = $(HOSTCC_ENV) $(STATEDIR)/hosttool-zlib.prepare: $(STATEDIR)/hosttool-zlib.extract @@ -72,7 +76,7 @@ hosttool-zlib_install: $(STATEDIR)/hosttool-zlib.install $(STATEDIR)/hosttool-zlib.install: $(STATEDIR)/hosttool-zlib.compile @$(call targetinfo, $@) - @$(call install, HOSTTOOL_ZLIB, $(HOSTTOOL_ZLIB_BUILDDIR)) + @$(call install, HOSTTOOL_ZLIB, $(HOSTTOOL_ZLIB_BUILDDIR),h) @$(call touch, $@) # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/hrtimers-support.make b/rules/hrtimers-support.make index 5b59c9719..d6c9934cb 100644 --- a/rules/hrtimers-support.make +++ b/rules/hrtimers-support.make @@ -75,8 +75,7 @@ HRTIMERS_SUPPORT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -HRTIMERS_SUPPORT_AUTOCONF = $(CROSS_AUTOCONF) -HRTIMERS_SUPPORT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +HRTIMERS_SUPPORT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/hrtimers-support.prepare: $(hrtimers-support_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/inetutils.make b/rules/inetutils.make index abccf7eda..be7f08cb4 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -75,8 +75,8 @@ INETUTILS_ENV = $(CROSS_ENV) # # autoconf # -INETUTILS_AUTOCONF = $(CROSS_AUTOCONF) -INETUTILS_AUTOCONF += --prefix=/usr \ +INETUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) +INETUTILS_AUTOCONF += \ --with-PATH-CP=/bin/cp \ --localstatedir=/var \ --sysconfdir=/etc diff --git a/rules/ipkg.make b/rules/ipkg.make index 4490c324d..8989f954d 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -77,8 +77,7 @@ IPKG_ENV = $(CROSS_ENV) # # autoconf # -IPKG_AUTOCONF = $(CROSS_AUTOCONF) -IPKG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +IPKG_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/ipkg.prepare: $(ipkg_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/jed.make b/rules/jed.make index 500b4f6ee..239b68178 100644 --- a/rules/jed.make +++ b/rules/jed.make @@ -78,8 +78,7 @@ JED_ENV = $(CROSS_ENV) # # autoconf # -JED_AUTOCONF = $(CROSS_AUTOCONF) -JED_AUTOCONF = --prefix=$(CROSS_LIB_DIR) +JED_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/jed.prepare: $(jed_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/joe.make b/rules/joe.make index ac17f8d21..a1a16d86f 100644 --- a/rules/joe.make +++ b/rules/joe.make @@ -73,7 +73,8 @@ JOE_ENV = $(CROSS_ENV) # # autoconf # -JOE_AUTOCONF = $(CROSS_AUTOCONF) +JOE_AUTOCONF = $(CROSS_AUTOCONF_USR) +# FIXME JOE_AUTOCONF += --prefix=/ $(STATEDIR)/joe.prepare: $(joe_prepare_deps) diff --git a/rules/kaffe.make b/rules/kaffe.make index 7661b95ad..7439a378b 100644 --- a/rules/kaffe.make +++ b/rules/kaffe.make @@ -115,7 +115,6 @@ KAFFE_ENV = $(CROSS_ENV) KAFFEH=$(PTXCONF_PREFIX)/bin/kaffeh # autoconf # KAFFE_AUTOCONF = $(CROSS_KAFFEE) -KAFFE_AUTOCONF += --prefix=/usr ifdef PTXCONF_KAFFE_ENG_INTRP KAFFE_AUTOCONF += --with-engine=intrp diff --git a/rules/kernel.make b/rules/kernel.make index b489811fd..08351cd84 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -443,7 +443,7 @@ KERNEL_MAKEVARS += $(PARALLELMFLAGS) ifdef PTXCONF_KERNEL_2_4 KERNEL_MAKEVARS += DEPMOD=$(call remove_quotes,$(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-depmod.old) else -KERNEL_MAKEVARS += DEPMOD=$(call remove_quotes,$(PTXCONF_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-depmod) +KERNEL_MAKEVARS += DEPMOD=$(call remove_quotes,$(PTXCONF_PREFIX)/sbin/depmod) endif KERNEL_MAKEVARS += ARCH=$(call remove_quotes,$(PTXCONF_ARCH)) KERNEL_MAKEVARS += CROSS_COMPILE=$(COMPILER_PREFIX) @@ -535,7 +535,7 @@ $(STATEDIR)/kernel.compile: $(kernel_compile_deps) ifndef PTXCONF_DONT_COMPILE_KERNEL mkdir -p $(PTXCONF_PREFIX)/bin echo "#!/bin/sh" > $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh - echo '$(PTXCONF_PREFIX)/bin/u-boot-mkimage "$$@"' >> $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh + echo '$(call remove_quotes,$(PTXCONF_PREFIX))/bin/u-boot-mkimage "$$@"' >> $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh chmod +x $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh cd $(KERNEL_DIR) && $(KERNEL_PATH) make \ diff --git a/rules/konq-e.make b/rules/konq-e.make index 8259ebb38..b9dc684ea 100644 --- a/rules/konq-e.make +++ b/rules/konq-e.make @@ -76,8 +76,7 @@ KONQ-E_ENV = $(CROSS_ENV) # # autoconf # -KONQ-E_AUTOCONF = $(CROSS_AUTOCONF) -KONQ-E_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +KONQ-E_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/konq-e.prepare: $(konq-e_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make index 87208c758..74b9f4afa 100644 --- a/rules/libIDL-2.make +++ b/rules/libIDL-2.make @@ -79,8 +79,7 @@ LIBIDL-2_ENV += libIDL_cv_long_long_format=ll # # autoconf # -LIBIDL-2_AUTOCONF = $(CROSS_AUTOCONF) -LIBIDL-2_AUTOCONF += --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBIDL-2_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_LIBIDL-2_FOO LIBIDL-2_AUTOCONF += --enable-foo diff --git a/rules/libIDL068.make b/rules/libIDL068.make index 399018220..03147d508 100644 --- a/rules/libIDL068.make +++ b/rules/libIDL068.make @@ -79,8 +79,7 @@ LIBIDL068_ENV += PKG_CONFIG_PATH=../$(GLIB22):../$(PANGO12):../$(ATK124):../$(LI # # autoconf # -LIBIDL068_AUTOCONF = $(CROSS_AUTOCONF) -LIBIDL068_AUTOCONF += --prefix=/$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBIDL068_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_LIBIDL068_FOO LIBIDL068_AUTOCONF += --enable-foo diff --git a/rules/libart.make b/rules/libart.make index 6c264c256..25168333a 100644 --- a/rules/libart.make +++ b/rules/libart.make @@ -76,8 +76,7 @@ LIBART_ENV = $(CROSS_ENV) # # autoconf # -LIBART_AUTOCONF = $(CROSS_AUTOCONF) -LIBART_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBART_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libart.prepare: $(libart_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libcgicc.make b/rules/libcgicc.make index 5563e209c..ca2ccd3b3 100644 --- a/rules/libcgicc.make +++ b/rules/libcgicc.make @@ -76,8 +76,7 @@ CGICC_ENV += # # autoconf # -CGICC_AUTOCONF = $(CROSS_AUTOCONF) -CGICC_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +CGICC_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/cgicc.prepare: $(cgicc_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libgd.make b/rules/libgd.make index 1ec29da36..fefbb3e44 100644 --- a/rules/libgd.make +++ b/rules/libgd.make @@ -76,8 +76,7 @@ LIBGD_ENV = $(CROSS_ENV) # # autoconf # -LIBGD_AUTOCONF = $(CROSS_AUTOCONF) -LIBGD_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBGD_AUTOCONF = $(CROSS_AUTOCONF_USR) #LIBGD_AUTOCONF += diff --git a/rules/libglade.make b/rules/libglade.make index fa761e11c..c442bb219 100644 --- a/rules/libglade.make +++ b/rules/libglade.make @@ -77,8 +77,7 @@ LIBGLADE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBGLADE_AUTOCONF = $(CROSS_AUTOCONF) -LIBGLADE_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBGLADE_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libglade.prepare: $(libglade_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make index 9a389d521..1642e5756 100644 --- a/rules/libgnomecanvas.make +++ b/rules/libgnomecanvas.make @@ -77,8 +77,7 @@ LIBGNOMECANVAS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -LIBGNOMECANVAS_AUTOCONF = $(CROSS_AUTOCONF) -LIBGNOMECANVAS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBGNOMECANVAS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libgnomecanvas.prepare: $(libgnomecanvas_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libgsloop.make b/rules/libgsloop.make index 908327218..5ad04bd87 100644 --- a/rules/libgsloop.make +++ b/rules/libgsloop.make @@ -78,8 +78,7 @@ LIBGSLOOP_ENV = $(CROSS_ENV) # # autoconf # -LIBGSLOOP_AUTOCONF = $(CROSS_AUTOCONF) -LIBGSLOOP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBGSLOOP_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libgsloop.prepare: $(libgsloop_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/liblist.make b/rules/liblist.make index 26e5e8754..3e0e1f7fc 100644 --- a/rules/liblist.make +++ b/rules/liblist.make @@ -76,8 +76,7 @@ LIBLIST_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBLIST_AUTOCONF = $(CROSS_AUTOCONF) -LIBLIST_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBLIST_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/liblist.prepare: $(liblist_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libmodbus.make b/rules/libmodbus.make index bb5a23199..c25654128 100644 --- a/rules/libmodbus.make +++ b/rules/libmodbus.make @@ -75,8 +75,7 @@ LIBMODBUS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBMODBUS_AUTOCONF = $(CROSS_AUTOCONF) -LIBMODBUS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBMODBUS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libmodbus.prepare: $(libmodbus_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libnet.make b/rules/libnet.make index 74c9b5bd9..7d4da952b 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -85,8 +85,7 @@ LIBNET_ENV = \ # # autoconf # -LIBNET_AUTOCONF = $(CROSS_AUTOCONF) -LIBNET_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBNET_AUTOCONF = $(CROSS_AUTOCONF_USR) LIBNET_AUTOCONF += --with-pf_packet=yes $(STATEDIR)/libnet.prepare: $(libnet_prepare_deps) diff --git a/rules/liboop.make b/rules/liboop.make index 87d31ca50..2bea37424 100644 --- a/rules/liboop.make +++ b/rules/liboop.make @@ -79,8 +79,8 @@ LIBOOP_ENV = \ # # autoconf # -LIBOOP_AUTOCONF = $(CROSS_AUTOCONF) -LIBOOP_AUTOCONF = --prefix=$(CROSS_LIB_DIR) \ +LIBOOP_AUTOCONF = $(CROSS_AUTOCONF_USR) +LIBOOP_AUTOCONF = \ --without-tcl \ --without-glib diff --git a/rules/libpcap.make b/rules/libpcap.make index 852e57f7d..b577b91d1 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -77,8 +77,7 @@ LIBPCAP_ENV = \ # # autoconf # -LIBPCAP_AUTOCONF = $(CROSS_AUTOCONF) -LIBPCAP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +LIBPCAP_AUTOCONF = $(CROSS_AUTOCONF_USR) LIBPCAP_AUTOCONF += --with-pcap=linux $(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps) diff --git a/rules/libpng125.make b/rules/libpng125.make index e882544d7..052cc2901 100644 --- a/rules/libpng125.make +++ b/rules/libpng125.make @@ -78,11 +78,17 @@ libpng125_prepare_deps = \ LIBPNG125_PATH = PATH=$(CROSS_PATH) LIBPNG125_ENV = $(CROSS_ENV) -LIBPNG125_AUTOCONF = $(CROSS_AUTOCONF) --prefix=$(CROSS_LIB_DIR) + +LIBPNG125_AUTOCONF = $(CROSS_AUTOCONF_USR) +# FIXME: this should be fixed upstream, the package doesn't take care of +# DESTDIR. When fixed, the following option shouldn't be needed any +# more. +LIBPNG125_AUTOCONF += --with-pkgconfigdir=$(SYSROOT)/lib $(STATEDIR)/libpng125.prepare: $(libpng125_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(LIBPNG125_BUILDDIR)) + @echo "FIXME: broken autoconf, see .make file" cd $(LIBPNG125_DIR) && \ $(LIBPNG125_PATH) $(LIBPNG125_ENV) \ ./configure $(LIBPNG125_AUTOCONF) diff --git a/rules/libpv.make b/rules/libpv.make index 35cd5ad64..9b86a2807 100644 --- a/rules/libpv.make +++ b/rules/libpv.make @@ -79,8 +79,8 @@ LIBPV_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBPV_AUTOCONF = $(CROSS_AUTOCONF) -LIBPV_AUTOCONF += --prefix=$(CROSS_LIB_DIR) --disable-debug +LIBPV_AUTOCONF = $(CROSS_AUTOCONF_USR) +LIBPV_AUTOCONF += --disable-debug $(STATEDIR)/libpv.prepare: $(libpv_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/librn.make b/rules/librn.make index 391b73643..6b4fddf43 100644 --- a/rules/librn.make +++ b/rules/librn.make @@ -78,8 +78,7 @@ LIBRN_ENV = $(CROSS_ENV) # autoconf # LIBRN_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=$(CROSS_LIB_DIR) \ + $(CROSS_AUTOCONF_USR) \ --disable-debug $(STATEDIR)/librn.prepare: $(librn_prepare_deps) diff --git a/rules/libxml2.make b/rules/libxml2.make index 16bae210d..d07bc5f9c 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -70,14 +70,11 @@ libxml2_prepare_deps = \ $(STATEDIR)/zlib.install LIBXML2_PATH = PATH=$(CROSS_PATH) -LIBXML2_ENV = $(CROSS_ENV) -#LIBXML2_ENV += # # autoconf # -LIBXML2_AUTOCONF = $(CROSS_AUTOCONF) -LIBXML2_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBXML2_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_LIBXML2_C14N LIBXML2_AUTOCONF += --with-c14n diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make index 1efadb953..c100bfef6 100644 --- a/rules/libxmlconfig.make +++ b/rules/libxmlconfig.make @@ -72,13 +72,11 @@ libxmlconfig_prepare_deps += $(STATEDIR)/liblist.install LIBXMLCONFIG_PATH = PATH=$(CROSS_PATH) LIBXMLCONFIG_ENV = $(CROSS_ENV) -LIBXMLCONFIG_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -LIBXMLCONFIG_AUTOCONF = $(CROSS_AUTOCONF) -LIBXMLCONFIG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +LIBXMLCONFIG_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/libxmlconfig.prepare: $(libxmlconfig_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/libxslt.make b/rules/libxslt.make index af950026d..1de186aad 100644 --- a/rules/libxslt.make +++ b/rules/libxslt.make @@ -78,9 +78,9 @@ LIBXSLT_ENV = $(CROSS_ENV) # # autoconf # -LIBXSLT_AUTOCONF = $(CROSS_AUTOCONF) -LIBXSLT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) -LIBXSLT_AUTOCONF += --with-libxml-prefix=$(CROSS_LIB_DIR) +LIBXSLT_AUTOCONF = $(CROSS_AUTOCONF_USR) +LIBXSLT_AUTOCONF += --with-libxml-libs-prefix=$(SYSROOT)/usr/lib +LIBXSLT_AUTOCONF += --with-libxml-include-prefix=$(SYSROOT)/usr/include ifdef PTXCONF_LIBXSLT_CRYPTO LIBXSLT_AUTOCONF += --with-crypto diff --git a/rules/lrzsz.make b/rules/lrzsz.make index 59caa02a8..b3e749a40 100644 --- a/rules/lrzsz.make +++ b/rules/lrzsz.make @@ -77,8 +77,7 @@ LRZSZ_ENV += CFLAGS=-Wstrict-prototypes # # autoconf # -LRZSZ_AUTOCONF = $(CROSS_AUTOCONF) -LRZSZ_AUTOCONF = --prefix=/usr +LRZSZ_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/lrzsz.prepare: $(lrzsz_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/lsh.make b/rules/lsh.make index d1729135b..75ac68080 100644 --- a/rules/lsh.make +++ b/rules/lsh.make @@ -83,9 +83,8 @@ LSH_ENV = $(CROSS_ENV) # # autoconf # -LSH_AUTOCONF = $(CROSS_AUTOCONF) +LSH_AUTOCONF = $(CROSS_AUTOCONF_USR) LSH_AUTOCONF = \ - --prefix=/usr \ --sysconfdir=/etc/lsh \ --disable-kerberos \ --disable-pam \ diff --git a/rules/ltt.make b/rules/ltt.make index 6ccef2a29..1ba891b83 100644 --- a/rules/ltt.make +++ b/rules/ltt.make @@ -68,8 +68,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 = $(CROSS_AUTOCONF_USR) LTT_AUTOCONF += --with-gtk=no # diff --git a/rules/mad.make b/rules/mad.make index 5f9d79d10..43de55c65 100644 --- a/rules/mad.make +++ b/rules/mad.make @@ -74,8 +74,7 @@ MAD_ENV = $(CROSS_ENV) # # autoconf # -MAD_AUTOCONF = $(CROSS_AUTOCONF) -MAD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +MAD_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/mad.prepare: $(mad_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/madwifi.make b/rules/madwifi.make index 08572bf24..fde882872 100644 --- a/rules/madwifi.make +++ b/rules/madwifi.make @@ -89,8 +89,7 @@ MADWIFI_ENV += TARGET=i386-elf # # autoconf # -MADWIFI_AUTOCONF = $(CROSS_AUTOCONF) -MADWIFI_AUTOCONF += --prefix=$(SYSROOT) +MADWIFI_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/madwifi.prepare: $(madwifi_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/memedit.make b/rules/memedit.make index 1d6263d27..7267b7622 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -78,7 +78,7 @@ MEMEDIT_ENV = $(CROSS_ENV) # # autoconf # -MEMEDIT_AUTOCONF = $(CROSS_AUTOCONF) +MEMEDIT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/memedit.prepare: $(memedit_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/memstat.make b/rules/memstat.make index 1f29ce7f7..f198fd9d2 100644 --- a/rules/memstat.make +++ b/rules/memstat.make @@ -77,8 +77,7 @@ MEMSTAT_ENV = $(CROSS_ENV) # # autoconf # -MEMSTAT_AUTOCONF = $(CROSS_AUTOCONF) -MEMSTAT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +MEMSTAT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/memstat.prepare: $(memstat_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/memtest.make b/rules/memtest.make index b143b8d7e..0be53bde6 100644 --- a/rules/memtest.make +++ b/rules/memtest.make @@ -75,8 +75,7 @@ MEMTEST_ENV = $(CROSS_ENV) # # autoconf # -MEMTEST_AUTOCONF = $(CROSS_AUTOCONF) -MEMTEST_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +MEMTEST_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/memtest.prepare: $(memtest_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/mfirebird.make b/rules/mfirebird.make index 0e89aad53..096dcb633 100644 --- a/rules/mfirebird.make +++ b/rules/mfirebird.make @@ -98,7 +98,7 @@ MFIREBIRD_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # autoconf # -MFIREBIRD_AUTOCONF = $(CROSS_AUTOCONF) +MFIREBIRD_AUTOCONF = $(CROSS_AUTOCONF_USR) MFIREBIRD_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index 20c3ccb41..92ef0fea1 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -71,9 +71,8 @@ MODULE_INIT_TOOLS_PATH = PATH=$(CROSS_PATH) MODULE_INIT_TOOLS_ENV = $(CROSS_ENV) MODULE_INIT_TOOLS_MAKEVARS = MAN5='' MODULE_INIT_TOOLS_AUTOCONF = \ - --prefix=/usr \ --target=$(PTXCONF_GNU_TARGET) \ - $(CROSS_AUTOCONF) + $(CROSS_AUTOCONF_USR) $(STATEDIR)/module-init-tools.prepare: $(module-init-tools_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/mplayer.make b/rules/mplayer.make index 2c9d9f46d..336b9a378 100644 --- a/rules/mplayer.make +++ b/rules/mplayer.make @@ -75,12 +75,11 @@ MPLAYER_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -#MPLAYER_AUTOCONF = $(CROSS_AUTOCONF) +#MPLAYER_AUTOCONF = $(CROSS_AUTOCONF_USR) -MPLAYER_AUTOCONF = --cc=$(PTXCONF_GNU_TARGET)-gcc +MPLAYER_AUTOCONF = --cc=$(PTXCONF_GNU_TARGET)-gcc MPLAYER_AUTOCONF += --as=$(PTXCONF_GNU_TARGET)-as MPLAYER_AUTOCONF += --host-cc=$(HOSTCC) -MPLAYER_AUTOCONF += --prefix=$(CROSS_LIB_DIR) MPLAYER_AUTOCONF += --target=$(PTXCONF_ARCH) MPLAYER_AUTOCONF += --disable-mencoder MPLAYER_AUTOCONF += --enable-fbdev diff --git a/rules/myghty.make b/rules/myghty.make index b31a53430..4117e00c2 100644 --- a/rules/myghty.make +++ b/rules/myghty.make @@ -75,8 +75,7 @@ MYGHTY_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -MYGHTY_AUTOCONF = $(CROSS_AUTOCONF) -MYGHTY_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +MYGHTY_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/myghty.prepare: $(myghty_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/nano.make b/rules/nano.make index 304a9f8c8..7e01969ef 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -77,8 +77,7 @@ NANO_ENV = $(CROSS_ENV) # # autoconf # -NANO_AUTOCONF = $(CROSS_AUTOCONF) -NANO_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +NANO_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/nano.prepare: $(nano_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/ncurses.make b/rules/ncurses.make index e0f641e33..73853568e 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -72,9 +72,8 @@ NCURSES_ENV = $(CROSS_ENV) # include directory... # -NCURSES_AUTOCONF = $(CROSS_AUTOCONF) +NCURSES_AUTOCONF = $(CROSS_AUTOCONF_USR) NCURSES_AUTOCONF += \ - --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/rules/netcat.make b/rules/netcat.make index f20df30f7..d2c3a7331 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -77,8 +77,7 @@ NETCAT_ENV = $(CROSS_ENV) # # autoconf # -NETCAT_AUTOCONF = $(CROSS_AUTOCONF) -NETCAT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +NETCAT_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_NETCAT_OLD_HEXDUMP NETCAT_AUTOCONF += --enable-oldhexdump diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make index 35b60cc28..00ccf1376 100644 --- a/rules/netkit-ftp.make +++ b/rules/netkit-ftp.make @@ -76,8 +76,7 @@ NETKIT-FTP_ENV = $(CROSS_ENV) # # autoconf # -#NETKIT-FTP_AUTOCONF = $(CROSS_AUTOCONF) -NETKIT-FTP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +NETKIT-FTP_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/netkit-ftp.prepare: $(netkit-ftp_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make index 98e69cdae..3abef45fb 100644 --- a/rules/nfs-utils.make +++ b/rules/nfs-utils.make @@ -66,7 +66,7 @@ nfsutils_prepare: $(STATEDIR)/nfsutils.prepare NFSUTILS_PATH = PATH=$(CROSS_PATH) NFSUTILS_ENV += CC_FOR_BUILD=$(HOSTCC) $(CROSS_ENV) -NFSUTILS_AUTOCONF = $(CROSS_AUTOCONF) +NFSUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) # 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 ed537b285..cdf6bf66c 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -82,8 +82,7 @@ NMAP_ENV = \ # # autoconf # -NMAP_AUTOCONF = $(CROSS_AUTOCONF) -NMAP_AUTOCONF += --prefix=/usr +NMAP_AUTOCONF = $(CROSS_AUTOCONF_USR) NMAP_AUTOCONF += --with-pcap=linux # # FIXME: diff --git a/rules/ntp.make b/rules/ntp.make index f09223c93..9820bea1a 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -76,8 +76,7 @@ NTP_ENV = $(CROSS_ENV) # # autoconf # -NTP_AUTOCONF = $(CROSS_AUTOCONF) -NTP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +NTP_AUTOCONF = $(CROSS_AUTOCONF_USR) # NTP: options, we need lots of options ;-) diff --git a/rules/omniorb.make b/rules/omniorb.make index 360cad2ba..4cfc28b58 100644 --- a/rules/omniorb.make +++ b/rules/omniorb.make @@ -77,8 +77,7 @@ OMNIORB_ENV = $(CROSS_ENV) # # autoconf # -OMNIORB_AUTOCONF = $(CROSS_AUTOCONF) -OMNIORB_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +OMNIORB_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_OMNIORB_SSL OMNIORB_AUTOCONF += --with-ssl endif diff --git a/rules/openafs.make b/rules/openafs.make index 04641bfc1..426e1af39 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -77,8 +77,7 @@ OPENAFS_ENV = $(CROSS_ENV) # # autoconf # -OPENAFS_AUTOCONF = $(CROSS_AUTOCONF) -OPENAFS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +OPENAFS_AUTOCONF = $(CROSS_AUTOCONF_USR) OPENAFS_AUTOCONF += -enable-tansac-paths OPENAFS_AUTOCONF += --with-afs-sysname=$(OPENAFS_SYS) OPENAFS_AUTOCONF += --with-linux-kernel-headers=$(KERNEL_DIR) diff --git a/rules/openntpd.make b/rules/openntpd.make index fee75deac..e5f5f109e 100644 --- a/rules/openntpd.make +++ b/rules/openntpd.make @@ -76,8 +76,7 @@ OPENNTPD_ENV = $(CROSS_ENV) # # autoconf # -OPENNTPD_AUTOCONF = $(CROSS_AUTOCONF) -OPENNTPD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +OPENNTPD_AUTOCONF = $(CROSS_AUTOCONF_USR) ifdef PTXCONF_OPENNTPD_ARC4RANDOM OPENNTPD_AUTOCONF += --with-builtin-arc4random diff --git a/rules/openssh.make b/rules/openssh.make index cb80b8a4d..299c1611e 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -125,8 +125,7 @@ OPENSSH_ENV = \ # autoconf # OPENSSH_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=/usr \ + $(CROSS_AUTOCONF_USR) \ --libexecdir=/usr/sbin \ --libdir=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib \ --with-ldflags=-L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib \ diff --git a/rules/openssl.make b/rules/openssl.make index 75ba8b347..2d51c6de4 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -98,7 +98,6 @@ OPENSSL_MAKEVARS = \ MANDIR=/man OPENSSL_AUTOCONF = \ - --prefix=/usr \ --openssldir=/etc/ssl ifdef PTXCONF_OPENSSL_SHARED diff --git a/rules/oprofile.make b/rules/oprofile.make index 5c73698ea..316a54f49 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -75,8 +75,7 @@ OPROFILE_ENV = $(CROSS_ENV) # # autoconf # -OPROFILE_AUTOCONF = $(CROSS_AUTOCONF) -OPROFILE_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +OPROFILE_AUTOCONF = $(CROSS_AUTOCONF_USR) 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 03c6ac41f..2b994a467 100644 --- a/rules/pango12.make +++ b/rules/pango12.make @@ -87,8 +87,7 @@ PANGO12_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -PANGO12_AUTOCONF = $(CROSS_AUTOCONF) -PANGO12_AUTOCONF + --prefix=$(CROSS_LIB_DIR) +PANGO12_AUTOCONF = $(CROSS_AUTOCONF_USR) PANGO12_AUTOCONF += --with-x=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/X11R6 PANGO12_AUTOCONF += --enable-explicit-deps diff --git a/rules/pcre.make b/rules/pcre.make index 8a68c2cdd..9a7dae03f 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -81,7 +81,6 @@ PCRE_ENV = $(CROSS_ENV) PCRE_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/pcre.prepare: $(pcre_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/pdksh.make b/rules/pdksh.make index 60380cae7..de04c21e9 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -57,11 +57,10 @@ $(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get pdksh_prepare: $(STATEDIR)/pdksh.prepare -PDKSH_AUTOCONF = $(CROSS_AUTOCONF) +PDKSH_AUTOCONF = $(CROSS_AUTOCONF_USR) PDKSH_AUTOCONF = \ --target=$(PTXCONF_GNU_TARGET) \ --disable-sanity-checks \ - --prefix=/usr PDKSH_PATH = PATH=$(CROSS_PATH) PDKSH_ENV = \ diff --git a/rules/penguzilla.make b/rules/penguzilla.make index 4d38cee09..6a9344a70 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -79,9 +79,7 @@ PENGUZILLA_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf # -PENGUZILLA_AUTOCONF = $(CROSS_AUTOCONF) -PENGUZILLA_AUTOCONF += --prefix=/usr - +PENGUZILLA_AUTOCONF = $(CROSS_AUTOCONF_USR) PENGUZILLA_AUTOCONF += --with-mozilla=$(MFIREBIRD_DIR) PENGUZILLA_AUTOCONF += --with-gtk-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) diff --git a/rules/php-apc.make b/rules/php-apc.make index 7f0d8be86..c9c5bc572 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -78,8 +78,7 @@ PHP_APC_ENV = $(CROSS_ENV) # autoconf # PHP_APC_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=$(CROSS_LIB_DIR) \ + $(CROSS_AUTOCONF_USR) \ --enable-apc $(STATEDIR)/php-apc.prepare: $(php-apc_prepare_deps) diff --git a/rules/php.make b/rules/php.make index 661de089f..712be94b9 100644 --- a/rules/php.make +++ b/rules/php.make @@ -84,8 +84,7 @@ PHP_ENV = \ # autoconf # PHP_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=$(CROSS_LIB_DIR) \ + $(CROSS_AUTOCONF_USR) \ --with-config-file-path=/etc \ --disable-all diff --git a/rules/pnet.make b/rules/pnet.make index 4bde707ef..e75f8469c 100644 --- a/rules/pnet.make +++ b/rules/pnet.make @@ -77,8 +77,7 @@ PNET_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -PNET_AUTOCONF = $(CROSS_AUTOCONF) -PNET_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +PNET_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/pnet.prepare: $(pnet_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/pnetlib.make b/rules/pnetlib.make index 20b0fcdf2..2f548aae5 100644 --- a/rules/pnetlib.make +++ b/rules/pnetlib.make @@ -77,8 +77,7 @@ PNETLIB_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -PNETLIB_AUTOCONF = $(CROSS_AUTOCONF) -PNETLIB_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +PNETLIB_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/pnetlib.prepare: $(pnetlib_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/pop3spam.make b/rules/pop3spam.make index f0a4182ff..a4448b15c 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -80,7 +80,6 @@ POP3SPAM_ENV = $(CROSS_ENV) POP3SPAM_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/pop3spam.prepare: $(pop3spam_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/popt.make b/rules/popt.make index ddc90f2d4..1f1959ccc 100644 --- a/rules/popt.make +++ b/rules/popt.make @@ -77,7 +77,6 @@ POPT_ENV = $(CROSS_ENV) # autoconf # POPT_AUTOCONF = \ - --prefix=$(CROSS_LIB_DIR) \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) diff --git a/rules/procps.make b/rules/procps.make index bfb16741c..95332938c 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -78,8 +78,7 @@ PROCPS_MAKEVARS += LDFLAGS=-L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib # # autoconf # -PROCPS_AUTOCONF = $(CROSS_AUTOCONF) -PROCPS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +PROCPS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/procps.prepare: $(procps_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/proftpd.make b/rules/proftpd.make index 43b6c2c50..916a9fb60 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -59,8 +59,7 @@ $(STATEDIR)/proftpd.extract: $(STATEDIR)/proftpd.get proftpd_prepare: $(STATEDIR)/proftpd.prepare -PROFTPD_AUTOCONF = $(CROSS_AUTOCONF) -PROFTPD_AUTOCONF += --prefix=/usr +PROFTPD_AUTOCONF = $(CROSS_AUTOCONF_USR) PROFTPD_AUTOCONF += --sysconfdir=/etc PROFTPD_PATH = PATH=$(CROSS_PATH) diff --git a/rules/pureftpd.make b/rules/pureftpd.make index 2e198ef26..760724ff3 100644 --- a/rules/pureftpd.make +++ b/rules/pureftpd.make @@ -78,8 +78,7 @@ PUREFTPD_ENV += ac_cv_func_snprintf=yes # autoconf # PUREFTPD_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=$(CROSS_LIB_DIR) \ + $(CROSS_AUTOCONF_USR) \ --with-standalone \ --without-inetd \ --without-ascii \ diff --git a/rules/python.make b/rules/python.make index 65795b645..a818f6886 100644 --- a/rules/python.make +++ b/rules/python.make @@ -75,8 +75,7 @@ python_prepare_deps = \ PYTHON_PATH = PATH=$(CROSS_PATH) PYTHON_ENV = $(CROSS_ENV) -PYTHON_AUTOCONF = $(CROSS_AUTOCONF) -PYTHON_AUTOCONF += --prefix=/usr +PYTHON_AUTOCONF = $(CROSS_AUTOCONF_USR) PYTHON_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) PYTHON_MAKEVARS = HOSTPYTHON=$(XCHAIN_PYTHON_BUILDDIR)/python diff --git a/rules/python24.make b/rules/python24.make index f232c18be..3fb7478d1 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -75,8 +75,7 @@ python24_prepare_deps = \ PYTHON24_PATH = PATH=$(CROSS_PATH) PYTHON24_ENV = $(CROSS_ENV) -PYTHON24_AUTOCONF = $(CROSS_AUTOCONF) -PYTHON24_AUTOCONF += --prefix=/usr +PYTHON24_AUTOCONF = $(CROSS_AUTOCONF_USR) PYTHON24_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) PYTHON24_MAKEVARS = HOSTPYTHON=$(XCHAIN_PYTHON24_BUILDDIR)/python diff --git a/rules/qt.make b/rules/qt.make index 4b4609c52..86223e915 100644 --- a/rules/qt.make +++ b/rules/qt.make @@ -77,7 +77,6 @@ QT_ENV += QTDIR=$(QT_DIR) # # autoconf # -#QT_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) #QT_AUTOCONF += --build=$(GNU_HOST) #QT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) diff --git a/rules/rawrec.make b/rules/rawrec.make index ec4367983..6721096f9 100644 --- a/rules/rawrec.make +++ b/rules/rawrec.make @@ -77,8 +77,7 @@ RAWREC_ENV = $(CROSS_ENV) # # autoconf # -RAWREC_AUTOCONF = $(CROSS_AUTOCONF) -RAWREC_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +RAWREC_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/rawrec.prepare: $(rawrec_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/readline.make b/rules/readline.make index f125137f7..ccc67ef8b 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -78,8 +78,7 @@ READLINE_ENV = $(CROSS_ENV) # # autoconf # -READLINE_AUTOCONF = $(CROSS_AUTOCONF) -READLINE_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +READLINE_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/readline.prepare: $(readline_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/realvnc.make b/rules/realvnc.make index 8750c118f..e53fc20d1 100644 --- a/rules/realvnc.make +++ b/rules/realvnc.make @@ -83,7 +83,6 @@ REALVNC_ENV = $(CROSS_ENV) REALVNC_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) REALVNC_AUTOCONF += --x-includes=$(CROSS_LIB_DIR)/include REALVNC_AUTOCONF += --x-libraries=$(CROSS_LIB_DIR)/lib REALVNC_AUTOCONF += --with-installed-zlib diff --git a/rules/rsync.make b/rules/rsync.make index fa2bdf1c5..6a9dc345f 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -74,8 +74,7 @@ RSYNC_ENV = rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes $(CROSS_ENV) # # autoconf # -RSYNC_AUTOCONF = $(CROSS_AUTOCONF) -RSYNC_AUTOCONF += --prefix=/usr +RSYNC_AUTOCONF = $(CROSS_AUTOCONF_USR) RSYNC_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) RSYNC_AUTOCONF += --with-included-popt diff --git a/rules/rtai.make b/rules/rtai.make index 99f8e25c2..c2aa4ef5d 100644 --- a/rules/rtai.make +++ b/rules/rtai.make @@ -77,7 +77,7 @@ rtai_prepare_deps = \ $(STATEDIR)/kernel.prepare \ $(STATEDIR)/rtai.extract -RTAI_AUTOCONF = $(CROSS_AUTOCONF) +RTAI_AUTOCONF = $(CROSS_AUTOCONF_USR) RTAI_AUTOCONF += \ --with-kconfig-file=$(RTAI_DIR)/.config \ --with-linux-dir=$(KERNEL_DIR) diff --git a/rules/rtnet.make b/rules/rtnet.make index 7bc6d8043..8175671ac 100644 --- a/rules/rtnet.make +++ b/rules/rtnet.make @@ -80,9 +80,8 @@ RTNET_ENV = $(CROSS_ENV) # # autoconf # -RTNET_AUTOCONF = $(CROSS_AUTOCONF) +RTNET_AUTOCONF = $(CROSS_AUTOCONF_USR) RTNET_AUTOCONF += \ - --prefix=$(CROSS_LIB_DIR) \ --with-rtai=$(RTAI_BUILDDIR)/usr/realtime # --with-rtai=$(RTAI_DIR) diff --git a/rules/setserial.make b/rules/setserial.make index f0ec3a330..d8c33ca47 100644 --- a/rules/setserial.make +++ b/rules/setserial.make @@ -75,8 +75,7 @@ SETSERIAL_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -SETSERIAL_AUTOCONF = $(CROSS_AUTOCONF) -SETSERIAL_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SETSERIAL_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/setserial.prepare: $(setserial_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/slang.make b/rules/slang.make index e19feb98e..4a1d68b79 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -75,8 +75,7 @@ SLANG_ENV = $(CROSS_ENV) # # autoconf # -SLANG_AUTOCONF = $(CROSS_AUTOCONF) -SLANG_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SLANG_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/slang.prepare: $(slang_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/smtpclient.make b/rules/smtpclient.make index aa0d1e0b5..797f2b09f 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -77,8 +77,7 @@ SMTPCLIENT_ENV = $(CROSS_ENV) # # autoconf # -SMTPCLIENT_AUTOCONF = $(CROSS_AUTOCONF) -SMTPCLIENT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SMTPCLIENT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/smtpclient.prepare: $(smtpclient_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/ssmtp.make b/rules/ssmtp.make index ba4e0a867..ccba371b6 100644 --- a/rules/ssmtp.make +++ b/rules/ssmtp.make @@ -85,8 +85,7 @@ SSMTP_ENV = $(CROSS_ENV) # # autoconf # -SSMTP_AUTOCONF = $(CROSS_AUTOCONF) -SSMTP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SSMTP_AUTOCONF = $(CROSS_AUTOCONF_USR) ifndef PTXCONF_SSMTP_REWRITE_DOMAIN SSMTP_AUTOCONF += --disable-rewrite-domain diff --git a/rules/strace.make b/rules/strace.make index c168d0f24..6b31d8eab 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -71,10 +71,9 @@ ifndef PTXCONF_STRACE_SHARED STRACE_ENV = LDFLAGS=-static endif -STRACE_AUTOCONF = $(CROSS_AUTOCONF) +STRACE_AUTOCONF = $(CROSS_AUTOCONF_USR) STRACE_AUTOCONF += \ --target=$(PTXCONF_GNU_TARGET) \ - --prefix=/usr \ --disable-sanity-checks $(STATEDIR)/strace.prepare: $(strace_prepare_deps) diff --git a/rules/sudo.make b/rules/sudo.make index cdf380752..a6ab60959 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -79,8 +79,7 @@ SUDO_ENV = $(CROSS_ENV) # # autoconf # -SUDO_AUTOCONF = $(CROSS_AUTOCONF) -SUDO_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SUDO_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/sudo.prepare: $(sudo_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 2ca7367b9..eaa413dd5 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -75,8 +75,7 @@ SYSFSUTILS_ENV = $(CROSS_ENV) # # autoconf # -SYSFSUTILS_AUTOCONF = $(CROSS_AUTOCONF) -SYSFSUTILS_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SYSFSUTILS_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/sysfsutils.prepare: $(sysfsutils_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/sysvinit.make b/rules/sysvinit.make index 4ee4f9576..1f2725540 100644 --- a/rules/sysvinit.make +++ b/rules/sysvinit.make @@ -80,8 +80,7 @@ SYSVINIT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -SYSVINIT_AUTOCONF = $(CROSS_AUTOCONF) -SYSVINIT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +SYSVINIT_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/sysvinit.prepare: $(sysvinit_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 438defb9c..115660b2b 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -78,8 +78,7 @@ TCPDUMP_ENV = $(CROSS_ENV) # # autoconf # -TCPDUMP_AUTOCONF = $(CROSS_AUTOCONF) -TCPDUMP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +TCPDUMP_AUTOCONF = $(CROSS_AUTOCONF_USR) # 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 e3cd3ffe5..6aa38b1fa 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -81,8 +81,7 @@ TERMCAP_ENV = $(CROSS_ENV) # # autoconf # -TERMCAP_AUTOCONF = $(CROSS_AUTOCONF) -TERMCAP_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +TERMCAP_AUTOCONF = $(CROSS_AUTOCONF_BROKEN_USR) $(STATEDIR)/termcap.prepare: $(termcap_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/thttpd.make b/rules/thttpd.make index fc334d5d6..1c0145a9b 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -75,8 +75,7 @@ THTTPD_ENV = $(CROSS_ENV) # # autoconf # -THTTPD_AUTOCONF = $(CROSS_AUTOCONF) -THTTPD_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +THTTPD_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/thttpd.prepare: $(thttpd_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/treecc.make b/rules/treecc.make index 14285a5be..4c5f7680a 100644 --- a/rules/treecc.make +++ b/rules/treecc.make @@ -76,8 +76,7 @@ TREECC_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -TREECC_AUTOCONF = $(CROSS_AUTOCONF) -TREECC_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +TREECC_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/treecc.prepare: $(treecc_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/tslib.make b/rules/tslib.make index 737c768dc..9708a440b 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -77,7 +77,7 @@ TSLIB_ENV += DESTDIR=$(CROSS_LIB_DIR) # # autoconf # -TSLIB_AUTOCONF = $(CROSS_AUTOCONF) +TSLIB_AUTOCONF = $(CROSS_AUTOCONF_USR) TSLIB_AUTOCONF += --prefix=/ TSLIB_AUTOCONF += --sysconfdir=/etc diff --git a/rules/udev.make b/rules/udev.make index 0f2692d88..e7e8a1a10 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -91,7 +91,7 @@ udev_compile_deps = $(STATEDIR)/udev.prepare $(STATEDIR)/udev.compile: $(udev_compile_deps) @$(call targetinfo, $@) - cd $(UDEV_DIR) && $(UDEV_ENV) $(UDEV_PATH) make $(UDEV_MAKEVARS) + cd $(UDEV_DIR) && $(UDEV_ENV) $(UDEV_PATH) make $(UDEV_MAKEVARS) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/valgrind.make b/rules/valgrind.make index 26a063d9f..4a570e974 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -76,8 +76,7 @@ VALGRIND_ENV = $(CROSS_ENV) # # autoconf # -VALGRIND_AUTOCONF = $(CROSS_AUTOCONF) -VALGRIND_AUTOCONF += --prefix=/ +VALGRIND_AUTOCONF = $(CROSS_AUTOCONF_USR) # If --enable-tls is not set, test for TLS fails in cross compiling # environment diff --git a/rules/wget.make b/rules/wget.make index 06781bd06..0131203df 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -77,8 +77,7 @@ WGET_ENV = $(CROSS_ENV) # # autoconf # -WGET_AUTOCONF = $(CROSS_AUTOCONF) -WGET_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +WGET_AUTOCONF = $(CROSS_AUTOCONF_USR) WGET_AUTOCONF += --without-socks WGET_AUTOCONF += --without-ssl diff --git a/rules/wxWindows.make b/rules/wxWindows.make index 0994ed51e..002541b3c 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -79,8 +79,7 @@ WXWINDOWS_ENV = $(CROSS_ENV) # # autoconf # -WXWINDOWS_AUTOCONF = $(CROSS_AUTOCONF) -WXWINDOWS_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +WXWINDOWS_AUTOCONF = $(CROSS_AUTOCONF_USR) 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 d3a527693..907903717 100644 --- a/rules/xalf.make +++ b/rules/xalf.make @@ -76,8 +76,7 @@ XALF_ENV = $(CROSS_ENV) # # autoconf # -XALF_AUTOCONF = $(CROSS_AUTOCONF) -XALF_AUTOCONF += --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) +XALF_AUTOCONF = $(CROSS_AUTOCONF_USR) #XALF_AUTOCONF += diff --git a/rules/xchain-gdb.make b/rules/xchain-gdb.make index bad515bde..ed77f57c0 100644 --- a/rules/xchain-gdb.make +++ b/rules/xchain-gdb.make @@ -88,7 +88,7 @@ xchain-gdb_install: $(STATEDIR)/xchain-gdb.install $(STATEDIR)/xchain-gdb.install: $(STATEDIR)/xchain-gdb.compile @$(call targetinfo, $@) - @$(call install, XCHAIN_GDB, $(XCHAIN_GDB_BUILDDIR)) + @$(call install, XCHAIN_GDB,$(XCHAIN_GDB_BUILDDIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/xchain-kaffe.make b/rules/xchain-kaffe.make index 51ec04d8b..64cb81e8d 100644 --- a/rules/xchain-kaffe.make +++ b/rules/xchain-kaffe.make @@ -54,6 +54,7 @@ $(STATEDIR)/xchain-kaffe.prepare: $(xchain-kaffe_prepare_deps) @$(call targetinfo, $@) @$(call clean, $(XCHAIN_KAFFE_BUILDDIR)) mkdir -p $(XCHAIN_KAFFE_BUILDDIR) + # FIXME cd $(XCHAIN_KAFFE_BUILDDIR) && \ $(XCHAIN_KAFFE_ENV) \ $(KAFFE_DIR)/configure --prefix=$(PTXCONF_PREFIX) diff --git a/rules/xchain-ltt.make b/rules/xchain-ltt.make index d685b5008..51ed2f083 100644 --- a/rules/xchain-ltt.make +++ b/rules/xchain-ltt.make @@ -58,7 +58,7 @@ XCHAIN_LTT_ENV = $(HOSTCC_ENV) # # autoconf # -XCHAIN_LTT_AUTOCONF = --prefix=$(PTXCONF_PREFIX) #--with-gtk=no +#XCHAIN_LTT_AUTOCONF = #--with-gtk=no $(STATEDIR)/xchain-ltt.prepare: $(xchain-ltt_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-damageext.make b/rules/xlibs-damageext.make index a4a32d862..bacea0ad6 100644 --- a/rules/xlibs-damageext.make +++ b/rules/xlibs-damageext.make @@ -80,7 +80,6 @@ XLIBS-DAMAGEEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-DAMAGEEXT_AUTOCONF = --build=$(GNU_HOST) XLIBS-DAMAGEEXT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) -XLIBS-DAMAGEEXT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/xlibs-damageext.prepare: $(xlibs-damageext_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-fixesext.make b/rules/xlibs-fixesext.make index 1e95e2c2a..1cd0e554b 100644 --- a/rules/xlibs-fixesext.make +++ b/rules/xlibs-fixesext.make @@ -81,7 +81,6 @@ XLIBS-FIXESEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig XLIBS-FIXESEXT_AUTOCONF = \ --build=$(GNU_HOST) \ --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/xlibs-fixesext.prepare: $(xlibs-fixesext_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-randr.make b/rules/xlibs-randr.make index f3578df7d..a2ecb66ee 100644 --- a/rules/xlibs-randr.make +++ b/rules/xlibs-randr.make @@ -80,8 +80,7 @@ XLIBS-RANDR_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-RANDR_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-randr.prepare: $(xlibs-randr_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-recordext.make b/rules/xlibs-recordext.make index f802dbc3f..8a2ef5fa1 100644 --- a/rules/xlibs-recordext.make +++ b/rules/xlibs-recordext.make @@ -80,8 +80,7 @@ XLIBS-RECORDEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-RECORDEXT_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-recordext.prepare: $(xlibs-recordext_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-render.make b/rules/xlibs-render.make index b30c2e224..13fa59d88 100644 --- a/rules/xlibs-render.make +++ b/rules/xlibs-render.make @@ -81,8 +81,7 @@ XLIBS-RENDER_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-RENDER_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-render.prepare: $(xlibs-render_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-x11.make b/rules/xlibs-x11.make index 15f262940..071a6f55a 100644 --- a/rules/xlibs-x11.make +++ b/rules/xlibs-x11.make @@ -82,8 +82,7 @@ XLIBS-X11_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-X11_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-x11.prepare: $(xlibs-x11_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xau.make b/rules/xlibs-xau.make index 52e8aaac6..1b8bee7e1 100644 --- a/rules/xlibs-xau.make +++ b/rules/xlibs-xau.make @@ -78,8 +78,7 @@ XLIBS-XAU_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XAU_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xau.prepare: $(xlibs-xau_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xext.make b/rules/xlibs-xext.make index 8286e54ed..f59a6b6aa 100644 --- a/rules/xlibs-xext.make +++ b/rules/xlibs-xext.make @@ -82,7 +82,6 @@ XLIBS-XEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XEXT_AUTOCONF = --build=$(GNU_HOST) XLIBS-XEXT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) -XLIBS-XEXT_AUTOCONF += --prefix=$(CROSS_LIB_DIR) $(STATEDIR)/xlibs-xext.prepare: $(xlibs-xext_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xextensions.make b/rules/xlibs-xextensions.make index 91e7f8a05..10962a468 100644 --- a/rules/xlibs-xextensions.make +++ b/rules/xlibs-xextensions.make @@ -80,8 +80,7 @@ XLIBS-XEXTENSIONS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XEXTENSIONS_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xextensions.prepare: $(xlibs-xextensions_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xfont.make b/rules/xlibs-xfont.make index a8fdf5965..246aa59e3 100644 --- a/rules/xlibs-xfont.make +++ b/rules/xlibs-xfont.make @@ -80,8 +80,7 @@ XLIBS-XFONT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XFONT_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xfont.prepare: $(xlibs-xfont_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xproto.make b/rules/xlibs-xproto.make index f9d87eef8..841a2228a 100644 --- a/rules/xlibs-xproto.make +++ b/rules/xlibs-xproto.make @@ -80,8 +80,7 @@ XLIBS-XPROTO_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XPROTO_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xproto.prepare: $(xlibs-xproto_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xtrans.make b/rules/xlibs-xtrans.make index 5a7977b41..a82b5244e 100644 --- a/rules/xlibs-xtrans.make +++ b/rules/xlibs-xtrans.make @@ -81,8 +81,7 @@ XLIBS-XTRANS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XTRANS_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xtrans.prepare: $(xlibs-xtrans_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-xtst.make b/rules/xlibs-xtst.make index c7eb88fa3..39bb6f115 100644 --- a/rules/xlibs-xtst.make +++ b/rules/xlibs-xtst.make @@ -78,8 +78,7 @@ XLIBS-XTST_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XLIBS-XTST_AUTOCONF = \ --build=$(GNU_HOST) \ - --host=$(PTXCONF_GNU_TARGET) \ - --prefix=$(CROSS_LIB_DIR) + --host=$(PTXCONF_GNU_TARGET) $(STATEDIR)/xlibs-xtst.prepare: $(xlibs-xtst_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xmlbench.make b/rules/xmlbench.make index b08887f30..c278ca220 100644 --- a/rules/xmlbench.make +++ b/rules/xmlbench.make @@ -78,8 +78,7 @@ XMLBENCH_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf # -XMLBENCH_AUTOCONF = $(CROSS_AUTOCONF) -XMLBENCH_AUTOCONF += --prefix=$(CROSS_LIB_DIR) +XMLBENCH_AUTOCONF = $(CROSS_AUTOCONF_USR) $(STATEDIR)/xmlbench.prepare: $(xmlbench_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index 7925e2a2f..18bbf2e06 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -79,11 +79,10 @@ XMLSTARLET_ENV = $(CROSS_ENV) # autoconf # XMLSTARLET_AUTOCONF = \ - $(CROSS_AUTOCONF) \ - --prefix=$(CROSS_LIB_DIR) \ - --with-libxml-prefix=$(CROSS_LIB_DIR) \ - --with-libxslt-prefix=$(CROSS_LIB_DIR) \ - --with-libiconv-prefix=$(CROSS_LIB_DIR) + $(CROSS_AUTOCONF_USR) \ + --with-libxml-prefix=$(SYSROOT)/usr \ + --with-libxslt-prefix=$(SYSROOT)/usr \ + --with-libiconv-prefix=$(SYSROOT)/usr $(STATEDIR)/xmlstarlet.prepare: $(xmlstarlet_prepare_deps) @$(call targetinfo, $@) diff --git a/rules/xserver.make b/rules/xserver.make index 33653186c..98b25f66f 100644 --- a/rules/xserver.make +++ b/rules/xserver.make @@ -86,7 +86,6 @@ XSERVER_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # XSERVER_AUTOCONF = --build=$(GNU_HOST) XSERVER_AUTOCONF += --host=$(PTXCONF_GNU_TARGET) -XSERVER_AUTOCONF += --prefix=$(CROSS_LIB_DIR) ifdef PTXCONF_XSERVER_SHAPE XSERVER_AUTOCONF += --enable-shape diff --git a/rules/zebra.make b/rules/zebra.make index 7268feea6..0b2540216 100644 --- a/rules/zebra.make +++ b/rules/zebra.make @@ -68,10 +68,9 @@ zebra_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/zebra.extract -ZEBRA_AUTOCONF = $(CROSS_AUTOCONF) +ZEBRA_AUTOCONF = $(CROSS_AUTOCONF_USR) ZEBRA_AUTOCONF += \ --with-cflags="$(TARGET_CFLAGS)" \ - --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=/etc/zebra \ --localstatedir=/var diff --git a/rules/zlib.make b/rules/zlib.make index 57f37db38..3dc1426eb 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -60,8 +60,8 @@ zlib_prepare_deps = \ ZLIB_PATH = PATH=$(CROSS_PATH) ZLIB_ENV = $(subst CFLAGS,SGALFC,$(CROSS_ENV)) AR="$(CROSS_AR) rc" -ZLIB_AUTOCONF = --shared --prefix=$(CROSS_LIB_DIR) - +ZLIB_AUTOCONF = --shared --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) + $(STATEDIR)/zlib.prepare: $(zlib_prepare_deps) @$(call targetinfo, $@) cd $(ZLIB_DIR) && $(ZLIB_ENV) $(ZLIB_PATH) ./configure $(ZLIB_AUTOCONF) |