From 9bb66ca13ec584a840c57ea5c606fe09534e01f8 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 9 Jul 2007 08:30:38 +0000 Subject: [PATCH] - the TARGET_CONFIGURE_OPTS have to be passed after $(MAKE). Fixes build breakage as seen by Ulf et al. --- package/argus/argus.mk | 2 +- package/distcc/distcc.mk | 2 +- package/flex/flex.mk | 2 +- package/kexec/kexec.mk | 2 +- package/l2tp/l2tp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libusb/libusb.mk | 2 +- package/microcom/microcom.mk | 2 +- package/mtd/mtd.mk | 5 ++++- package/nano/nano.mk | 2 +- package/netcat/netcat.mk | 2 +- package/procps/procps.mk | 2 +- package/qte/qte.mk | 8 ++++---- package/qtopia4/qtopia4.mk | 2 +- package/quagga/quagga.mk | 2 +- package/rsync/rsync.mk | 2 +- package/samba/samba.mk | 4 ++-- package/thttpd/thttpd.mk | 2 +- package/tinyx/tinyx.mk | 2 +- package/usbutils/usbutils.mk | 2 +- package/wget/wget.mk | 2 +- 21 files changed, 28 insertions(+), 25 deletions(-) diff --git a/package/argus/argus.mk b/package/argus/argus.mk index fffce7119c..17382affcb 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -45,7 +45,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked touch $@ $(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(ARGUS_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(ARGUS_DIR) $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY) cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@ diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 941b581d76..75166d27ec 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -45,7 +45,7 @@ $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked touch $(DISTCC_DIR)/.configured $(DISTCC_DIR)/$(DISTCC_BINARY): $(DISTCC_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(DISTCC_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_DIR) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_DIR)/$(DISTCC_BINARY) install -D $(DISTCC_DIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 882ee5847d..c08addaf62 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -58,7 +58,7 @@ $(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked touch $@ $(FLEX_DIR)/$(FLEX_BINARY): $(FLEX_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(FLEX_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FLEX_DIR) $(TARGET_DIR)/$(FLEX_TARGET_BINARY): $(FLEX_DIR)/$(FLEX_BINARY) $(MAKE1) \ diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 0abecaf9e8..50dbfa539c 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -53,7 +53,7 @@ $(KEXEC_DIR)/.configured: $(KEXEC_DIR)/.unpacked touch $@ $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY): $(KEXEC_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(KEXEC_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(KEXEC_DIR) touch -c $@ $(TARGET_DIR)/$(KEXEC_TARGET_BINARY): $(KEXEC_DIR)/objdir-$(GNU_TARGET_NAME)/build/sbin/$(KEXEC_BINARY) diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index 1efc631ccf..0a0763ace4 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -33,7 +33,7 @@ endif touch $(L2TP_DIR)/.unpacked $(L2TP_DIR)/$(L2TP_BINARY): $(L2TP_DIR)/.unpacked - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(L2TP_DIR) CC=$(TARGET_CC) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(L2TP_DIR) \ DFLAGS= \ OSFLAGS="-DLINUX -UUSE_KERNEL $(TARGET_CFLAGS) -USANITY" diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 953b4da0c3..2c81227809 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -37,7 +37,7 @@ $(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked touch $@ $(LIBEVENT_DIR)/$(LIBEVENT_BINARY): $(LIBEVENT_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBEVENT_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEVENT_DIR) $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY): $(LIBEVENT_DIR)/$(LIBEVENT_BINARY) $(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(STAGING_DIR) install diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 42e33bd8a5..76eecbc179 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -36,7 +36,7 @@ $(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.unpacked touch $(LIBUSB_DIR)/.configured $(STAGING_DIR)/$(LIBUSB_BINARY): $(LIBUSB_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBUSB_DIR) $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/$(LIBUSB_BINARY) diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index a57b882f2c..195a49e87c 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -51,7 +51,7 @@ ifeq ($(BR2_PREFER_IMA),y) $(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \ ) else - $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -C $(MICROCOM_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR) endif $(STRIP) -s $@ diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 0d7572afd5..1673523b00 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -115,7 +115,10 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/util/, $(MTD_TARGETS_y)) $(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked - $(TARGET_CONFIGURE_OPTS) $(MAKE) CFLAGS="-I$(MTD_DIR)/include -I$(LINUX_HEADERS_DIR)/include" LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS+="-I$(MTD_DIR)/include" \ + CFLAGS+="-I$(LINUX_HEADERS_DIR)/include" \ + LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y)) diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 17fdddd85f..ff28187201 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -35,7 +35,7 @@ $(NANO_DIR)/.configured: $(NANO_DIR)/.unpacked touch $(NANO_DIR)/.configured $(NANO_DIR)/$(NANO_BINARY): $(NANO_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(NANO_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(NANO_DIR) $(TARGET_DIR)/$(NANO_TARGET_BINARY): $(NANO_DIR)/$(NANO_BINARY) install -D $(NANO_DIR)/$(NANO_BINARY) $(TARGET_DIR)/$(NANO_TARGET_BINARY) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 9a51663389..cc172096ad 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -35,7 +35,7 @@ $(NETCAT_DIR)/.configured: $(NETCAT_DIR)/.unpacked $(NETCAT_DIR)/$(NETCAT_BINARY): $(NETCAT_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(NETCAT_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(NETCAT_DIR) $(TARGET_DIR)/$(NETCAT_TARGET_BINARY): $(NETCAT_DIR)/$(NETCAT_BINARY) install -D $(NETCAT_DIR)/$(NETCAT_BINARY) $(TARGET_DIR)/$(NETCAT_TARGET_BINARY) diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 3cab79d827..6cd92aea48 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -22,7 +22,7 @@ $(PROCPS_DIR)/$(PROCPS_BINARY): $(PROCPS_DIR)/.source $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(PROCPS_DIR) $(TARGET_DIR)/$(PROCPS_TARGET_BINARY): $(PROCPS_DIR)/$(PROCPS_BINARY) - $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ install='install -D' -C $(PROCPS_DIR) lib64=/lib \ ldconfig='/bin/true' install rm -Rf $(TARGET_DIR)/usr/share/man diff --git a/package/qte/qte.mk b/package/qte/qte.mk index 571c3264a7..0cc23d10f4 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -222,18 +222,18 @@ $(QTE_QTE_DIR)/src-mt.mk: $(QTE_QTE_DIR)/.configured $(QTE_QTE_LIB): $(QTE_QTE_DIR)/src-mt.mk export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(TARGET_CC) DESTDIR=$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CC) -C $(QTE_QTE_DIR) src-mt + $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR)/lib -C $(QTE_QTE_DIR) src-mt # ... and make sure it actually built... grrr... make deep-deep-deep makefile recursion for this habit test -f $@ $(QTE_QTOPIA_FILE): $(QTE_QTOPIA_DIR)/.configured export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR) $(QTE_QTOPIA_IFILE): $(QTE_QTOPIA_FILE) export QTDIR=$(QTE_QT3_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QTE_QTOPIA_DIR) install PREFIX=$(TARGET_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QTE_QTOPIA_DIR) install PREFIX=$(TARGET_DIR) qte:: $(QTE_QTE_LIB) diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index e1cded34f4..22a189fd07 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -161,7 +161,7 @@ endif touch $(QTOPIA4_TARGET_DIR)/.configured $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -C $(QTOPIA4_TARGET_DIR) sub-src $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VER): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VER) diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 3344d1bb2e..e2b66ddc9a 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -152,7 +152,7 @@ $(QUAGGA_DIR)/.configured: $(QUAGGA_DIR)/.unpacked touch $@ $(QUAGGA_BINARY): $(QUAGGA_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(QUAGGA_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QUAGGA_DIR) $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY): $(QUAGGA_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) install diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index cd98425cd6..c22c8e6dc8 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -35,7 +35,7 @@ $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked touch $(RSYNC_DIR)/.configured $(RSYNC_DIR)/$(RSYNC_BINARY): $(RSYNC_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(RSYNC_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(RSYNC_DIR) $(TARGET_DIR)/$(RSYNC_TARGET_BINARY): $(RSYNC_DIR)/$(RSYNC_BINARY) install -D $(RSYNC_DIR)/$(RSYNC_BINARY) $(TARGET_DIR)/$(RSYNC_TARGET_BINARY) diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 9eabfec59f..5098d2d9d5 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -46,7 +46,7 @@ $(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked touch $(SAMBA_DIR)/.configured $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR) SAMBA_TARGETS_ := SAMBA_TARGETS_y := @@ -79,7 +79,7 @@ SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/sbin/winbindd SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo $(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ prefix="${TARGET_DIR}/usr" \ BASEDIR="${TARGET_DIR}/usr" \ SBINDIR="${TARGET_DIR}/usr/sbin" \ diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 52dccb9fcc..f9fbc667d7 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -35,7 +35,7 @@ $(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked touch $(THTTPD_DIR)/.configured $(THTTPD_DIR)/$(THTTPD_BINARY): $(THTTPD_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(THTTPD_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(THTTPD_DIR) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY): $(THTTPD_DIR)/$(THTTPD_BINARY) install -D $(THTTPD_DIR)/$(THTTPD_BINARY) $(TARGET_DIR)/$(THTTPD_TARGET_BINARY) diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index 063aab039f..6011e6fcfc 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -85,7 +85,7 @@ $(TINYX_XFBDEV): $(TINYX_DIR)/.configure rm -f $(TINYX_BINX)/Xfbdev #make World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR="; #( cd $(TINYX_DIR) ; $(MAKE) World CROSSCOMPILEFLAGS="CROSSCOMPILEDIR=$(STAGING_DIR)/bin" ) - #( cd $(TINYX_DIR) ; $(TARGET_CONFIGURE_OPTS) $(MAKE) World ) + #( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World ) # #mv $(TINYX_DIR)/Makefile $(TINYX_DIR)/Makefile.xxxx #echo "AS=$(TARGET_CROSS)as" > $(TINYX_DIR)/Makefile diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index ffb2f57f50..447cb5a68f 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -35,7 +35,7 @@ $(USBUTILS_DIR)/.configured: $(USBUTILS_DIR)/.unpacked touch $(USBUTILS_DIR)/.configured $(USBUTILS_DIR)/$(USBUTILS_BINARY): $(USBUTILS_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(USBUTILS_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(USBUTILS_DIR) $(TARGET_DIR)/$(USBUTILS_TARGET_BINARY): $(USBUTILS_DIR)/$(USBUTILS_BINARY) $(MAKE) -C $(USBUTILS_DIR) DESTDIR=$(TARGET_DIR) install diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d6e832087b..834a3f9006 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -36,7 +36,7 @@ $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked touch $(WGET_DIR)/.configured $(WGET_DIR)/$(WGET_BINARY): $(WGET_DIR)/.configured - $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(WGET_DIR) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(WGET_DIR) $(TARGET_DIR)/$(WGET_TARGET_BINARY): $(WGET_DIR)/$(WGET_BINARY) install -D $(WGET_DIR)/$(WGET_BINARY) $(TARGET_DIR)/$(WGET_TARGET_BINARY) -- 2.30.2