yet more LDFLAGS handling fixups

diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk
index b5f34dd697149b5592a3c88859a29e7583a87c5d..c86f78e54b8f6a14b38348129b657fcc8364db02 100644 (file)
--- 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 85405b7e3f8e7f91b2e06e2957eb6fb82aa2de89..ff0aac6e56d0e4132ca35452e61267b502a9ad1f 100644 (file)
--- 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 4f5bb39e5349fd856e91f649e28fa7d8ccd06add..c7a738e38fd2844a335707df9f78eab6f06fbfc6 100644 (file)
--- 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 995f72e646cd3c045ec952e64d6894a280454f20..fea8af2efd5ec7ad4cf2d48402ab344c09a189ba 100644 (file)
--- 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 688f8e5482f12cb419db07c92c20de79a59cd390..102f95d2e9f964cdea85da9282dc2c534accd66e 100644 (file)
--- 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 6ac0b20a95b4c78534aca14bcce06b678aee6cdf..70a39f65edb71992bcd71499e0a4a25000c11aa5 100644 (file)
--- 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 15f57ab715878449fedffee21633419e554c55a6..092a53dc01efb2e267793eedc75996a2d341abf2 100644 (file)
--- 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 631ba13771bec54f81d18eff432dd157122d4f98..ed99cac61d8f6f64013d69f038bea7b3d4e1fc2c 100644 (file)
--- 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 c18cc1d02c2b834a6ab2dc15c49b3db46392bc4e..bbda01740e5f2d336d1842b5848757061805dc7a 100644 (file)
--- 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 ccb2e9edd3eed0b7c7dab7d45783fc9d2d236b8d..3f0df7af0cb3a2ac00567413b461092c2418cbfc 100644 (file)
--- 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 4572bb415300226fe7718973e91cd76de1873940..146d86979f0ab8da659cd86bf9a83aa0d1f9be13 100644 (file)
--- 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 f3ccd6df52a2f8333b66048a7f7e1885b6feb5a1..2a29c07ddb9440f5967b5f76a823da2c819f6ace 100644 (file)
--- 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 7195b85ce2b57f4a31c957717cec82b9bb0dbb52..b4f9c4ef92c91165aa5587f8824413946978f553 100644 (file)
--- 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 78830a937280d7372274293b8e658dce281a37f1..8892f96290f688e98e2bf425f54e2b151b367777 100644 (file)
--- 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 d053912073b7ff109f95b896cf4d55930fd9eb93..25dc98aba64053fb888adefc155daace50f1d55e 100644 (file)
--- 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 9b7298417288c8bbe241b3f49a6f2e2ff4f23cc8..f49b10de6087e66a34cde4534f13b15eb8a4faf8 100644 (file)
--- 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 b54c577cf6554be790303fb78a3f914ca9ffea79..9d1d1ab7d9bf85dc70af860fb860b670771f931c 100644 (file)
--- 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 346e3ec8ed16be091fde2e3339f1577e8fc1ac03..5515e756039be936af60b3a1d76e6c19408a76b0 100644 (file)
--- 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 56786b62c54ff9ffab686579395b04fb26922dd9..cafcb3a2163a7b46f33b8cc44e61a23679edf5f0 100644 (file)
--- 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 9c6767530c5e49d58f7c3ed838a7d81dec7982f0..85ef7a60bcf2a66b348aab4d9830190a47f0d6a2 100644 (file)
--- 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 e2a634641edd6f4eb4a3a6752c70f1d8a704980d..2b1c4a362ff49aaba1f9dc7071347fc3dea095af 100644 (file)
--- 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 97573f904eddbae23ffa649c88efe77d8a7085db..3a2f184f3e45a3c3988843f77ab5aad2467a4bed 100644 (file)
--- 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 6899e525aa032d04741a1a003629c9a91d7c368b..c1d0b461c3a350dd89c69309064573e2b37a1764 100644 (file)
--- 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 722b0339193b48f3138215e2f05a2ae67fad4ef8..a87c14f4b7882568aee6c1b4ba5ebd0deea324c4 100644 (file)
--- 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 4cb3aecc7f2ff4da73cd104402ddd46634b14116..d74825671196a378980c99442d50bb5a7608122f 100644 (file)
--- 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 fd40ea26a6301755387326b43df124f8e63ab78b..76a2291f77389c7594391bf77a021fae26c68f48 100644 (file)
--- 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 \