lockfile-progs: use correct CFLAGS

Use the correct CFLAGS from BR and not just the LDFLAGS. This is especially
important for external toolchain setups, but the lockfile-progs buildsystem
also hardcodes -Werror, which breaks the build in certain setups.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 5f658244a7a0f976be6b62c7879dbb37c9dd115f..c6b64c0fabe473b6d791ac6668ec4a2ef633ee05 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,8 @@
 
        Fixes all over the tree.
 
-       Updated/fixed packages: coreutils, hal, libcap, ncftp,
-       xserver_xorg-server
+       Updated/fixed packages: coreutils, hal, libcap,
+       lockfile-progs, ncftp, xserver_xorg-server
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index 6494f81196b8324a0d7c8c19ba7a6d0846bd3ac0..4098330ba23def9a9c8dfe63f362663272db92d9 100644 (file)
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -21,7 +21,7 @@ $(LOCKFILE_PROGS_DIR)/.unpacked: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)
        touch $(LOCKFILE_PROGS_DIR)/.unpacked
 
 $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ENV) \
                -C $(LOCKFILE_PROGS_DIR)
        cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin
        $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)