From 15177a6e9566e2929e77eda44eff5116b6f0e587 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 14 Mar 2007 03:12:22 +0000 Subject: [PATCH] yet more LDFLAGS handling fixups --- package/pkgconfig/pkgconfig.mk | 2 -- package/procps/procps.mk | 1 + package/sdl/sdl.mk | 2 +- package/sed/sed.mk | 2 +- package/setserial/setserial.mk | 2 +- package/smartmontools/smartmontools.mk | 2 +- package/socat/socat.mk | 2 +- package/strace/strace.mk | 2 +- package/stunnel/stunnel.mk | 2 +- package/sudo/sudo.mk | 2 +- package/tar/tar.mk | 2 +- package/tcl/tcl.mk | 2 +- package/tcpdump/dhcpdump.mk | 2 +- package/tcpdump/tcpdump.mk | 2 +- package/tftpd/tftpd.mk | 2 +- package/thttpd/thttpd.mk | 2 +- package/tiff/tiff.mk | 2 +- package/tn5250/tn5250.mk | 2 +- package/usbutils/usbutils.mk | 2 +- package/util-linux/util-linux.mk | 2 +- package/valgrind/valgrind.mk | 2 +- package/vtun/vtun.mk | 2 +- package/wget/wget.mk | 2 +- package/which/which.mk | 2 +- package/xfsprogs/xfsprogs.mk | 2 +- package/zlib/zlib.mk | 4 ++-- 26 files changed, 26 insertions(+), 27 deletions(-) diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index b5f34dd697..c86f78e54b 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -23,8 +23,6 @@ $(PKGCONFIG_DIR)/.unpacked: $(DL_DIR)/$(PKGCONFIG_SOURCE) $(PKGCONFIG_DIR)/.configured: $(PKGCONFIG_DIR)/.unpacked (cd $(PKGCONFIG_DIR); rm -rf config.cache; \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --prefix=/usr \ --exec-prefix=/usr \ diff --git a/package/procps/procps.mk b/package/procps/procps.mk index 85405b7e3f..ff0aac6e56 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -17,6 +17,7 @@ $(PROCPS_DIR)/.source: $(DL_DIR)/$(PROCPS_SOURCE) $(ZCAT) $(DL_DIR)/$(PROCPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(PROCPS_DIR) package/procps/ procps\*.patch $(SED) '/^CFLAGS/s:-O2:$(TARGET_CFLAGS):' $(PROCPS_DIR)/Makefile + $(SED) '/^LDFLAGS/s:$$:$(TARGET_LDFLAGS):' $(PROCPS_DIR)/Makefile touch $(PROCPS_DIR)/.source $(PROCPS_DIR)/$(PROCPS_BINARY): $(PROCPS_DIR)/.source diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 4f5bb39e53..c7a738e38f 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -22,7 +22,7 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked (cd $(SDL_DIR); \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 995f72e646..fea8af2efd 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -97,7 +97,7 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked (cd $(SED_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ CPPFLAGS="$(SED_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 688f8e5482..102f95d2e9 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -34,7 +34,7 @@ $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked (cd $(SETSERIAL_DIR); rm -rf config.cache ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(SETSERIAL_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 6ac0b20a95..70a39f65ed 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -27,7 +27,7 @@ $(SMARTMONTOOLS_DIR)/.configured: $(SMARTMONTOOLS_DIR)/.unpacked (cd $(SMARTMONTOOLS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 15f57ab715..092a53dc01 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -30,7 +30,7 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked (cd $(SOCAT_WORKDIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ $(SOCAT_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 631ba13771..ed99cac61d 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -30,7 +30,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(BR2_STRACE_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ aaa_ac_cv_header_linux_if_packet_h=yes \ ./configure \ --target=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index c18cc1d02c..bbda01740e 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -25,7 +25,7 @@ $(STUNNEL_DIR)/.configured: $(STUNNEL_DIR)/.unpacked (cd $(STUNNEL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ac_cv_file___dev_ptmx_=yes \ ac_cv_file___dev_ptc_=no \ ./configure \ diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index ccb2e9edd3..3f0df7af0c 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -25,7 +25,7 @@ $(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE) $(TARGET_CONFIGURE_OPTS) \ ./configure \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 4572bb4153..146d86979f 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -25,7 +25,7 @@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked (cd $(GNUTAR_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ac_cv_func_chown_works=yes \ gl_cv_func_chown_follows_symlink=yes \ ./configure \ diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index f3ccd6df52..2a29c07ddb 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -20,7 +20,7 @@ $(TCL_DIR)/.configured: $(TCL_DIR)/.source (cd $(TCL_DIR)/unix; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index 7195b85ce2..b4f9c4ef92 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -27,7 +27,7 @@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 78830a9372..8892f96290 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -28,7 +28,7 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index d053912073..25dc98aba6 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -25,7 +25,7 @@ $(TFTP_HPA_DIR)/.configured: $(TFTP_HPA_DIR)/.unpacked (cd $(TFTP_HPA_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 9b72984172..f49b10de60 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -26,7 +26,7 @@ $(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked (cd $(THTTPD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index b54c577cf6..9d1d1ab7d9 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -24,7 +24,7 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked (cd $(TIFF_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 346e3ec8ed..5515e75603 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -14,7 +14,7 @@ $(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist (cd $(TN5250_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 56786b62c5..cafcb3a216 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -25,7 +25,7 @@ $(USBUTILS_DIR)/.configured: $(USBUTILS_DIR)/.unpacked (cd $(USBUTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 9c6767530c..85ef7a60bc 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -26,7 +26,7 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked (cd $(UTIL-LINUX_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --prefix=/usr \ diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index e2a634641e..2b1c4a362f 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -25,7 +25,7 @@ $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched (cd $(VALGRIND_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 97573f904e..3a2f184f3e 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -28,7 +28,7 @@ $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked (cd $(VTUN_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 6899e525aa..c1d0b461c3 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -24,7 +24,7 @@ $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked (cd $(WGET_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/which/which.mk b/package/which/which.mk index 722b033919..a87c14f4b7 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -24,7 +24,7 @@ $(WHICH_DIR)/.configured: $(WHICH_DIR)/.unpacked (cd $(WHICH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 4cb3aecc7f..d748256711 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -53,7 +53,7 @@ $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked $(XFSPROGS_DIR)/$(XFSPROGS_BINARY): $(XFSPROGS_DIR)/.configured $(MAKE1) PATH=$(TARGET_PATH) CPPFLAGS=-I$(E2FSPROGS_DIR)/lib \ - LDFLAGS=-L$(E2FSPROGS_DIR)/lib -C $(XFSPROGS_DIR) + LDFLAGS="$(TARGET_LDFLAGS) -L$(E2FSPROGS_DIR)/lib" -C $(XFSPROGS_DIR) ifeq ($(XFSPROGS_CONFIG_SHARED),--enable-shared) ( \ cd $(XFSPROGS_DIR) ; \ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index fd40ea26a6..76a2291f77 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -24,8 +24,8 @@ $(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE) $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.source (cd $(ZLIB_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(ZLIB_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + CFLAGS="$(TARGET_CFLAGS) $(ZLIB_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --shared \ --prefix=/usr \ -- 2.30.2