diff options
137 files changed, 174 insertions, 318 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 0b57a9c08..6efcbd87d 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -207,9 +207,17 @@ ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG) BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no endif +ifeq ($(BR2_ENDIAN),"BIG") +BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=yes +else +BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=no +endif + TARGET_CONFIGURE_ARGS= \ $(BR2_AC_CV_TRAP_CHECK) \ - + ac_cv_func_mmap_fixed_mapped=yes \ + ac_cv_func_memcmp_working=yes \ + $(BR2_AC_CV_C_BIGENDIAN) ####################################################################### diff --git a/package/argus/argus.mk b/package/argus/argus.mk index 71eb55af6..fffce7119 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -34,8 +34,6 @@ endif $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked (cd $(ARGUS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/at/at.mk b/package/at/at.mk index 43277fd6a..054325e96 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -24,8 +24,7 @@ $(AT_DIR)/.unpacked: $(DL_DIR)/$(AT_SOURCE) $(AT_DIR)/.configured: $(AT_DIR)/.unpacked (cd $(AT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 3b941518b..76875f46e 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -10,12 +10,6 @@ ATK_CAT:=$(BZCAT) ATK_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION) ATK_BINARY:=libatk-1.0.a -ifeq ($(BR2_ENDIAN),"BIG") -ATK_BE:=yes -else -ATK_BE:=no -endif - $(DL_DIR)/$(ATK_SOURCE): $(WGET) -P $(DL_DIR) $(ATK_SITE)/$(ATK_SOURCE) @@ -30,9 +24,7 @@ $(ATK_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE) $(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked (cd $(ATK_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_c_bigendian=$(ATK_BE) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk index 440486764..5b5ae1a7f 100644 --- a/package/aumix/aumix.mk +++ b/package/aumix/aumix.mk @@ -20,8 +20,7 @@ $(AUMIX_DIR)/.unpacked: $(DL_DIR)/$(AUMIX_SOURCE) $(AUMIX_DIR)/.configured: $(AUMIX_DIR)/.unpacked (cd $(AUMIX_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 66ae6f166..b05a7d136 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -22,9 +22,9 @@ $(AUTOCONF_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE) $(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked (cd $(AUTOCONF_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) EMACS="no" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + EMACS="no" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/automake/automake.mk b/package/automake/automake.mk index b51918bd6..1e1c89816 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -24,8 +24,7 @@ $(AUTOMAKE_DIR)/.unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE) $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked (cd $(AUTOMAKE_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ WANT_AUTOCONF=2.5 \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 9f8ed948e..f70e409bd 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -45,11 +45,9 @@ $(AVAHI_DIR)/.unpacked: $(DL_DIR)/$(AVAHI_SOURCE) $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP) (cd $(AVAHI_DIR) && rm -rf config.cache && autoconf) - ( \ - cd $(AVAHI_DIR) && \ + (cd $(AVAHI_DIR) && \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/include" \ LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \ ac_cv_func_strtod=yes \ diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9201753be..376f05c01 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -32,8 +32,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked # bash_cv_have_mbstate_t=yes (cd $(BASH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ ac_cv_func_setvbuf_reversed=no \ ./configure \ diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 0917cb920..0dd91fe34 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -22,8 +22,7 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE) $(DB_DIR)/.configured: $(DB_DIR)/.dist (cd $(DB_DIR)/build_unix; rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ../dist/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 9fdd809f6..2c21be306 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -30,8 +30,7 @@ $(BIND_DIR2)/.unpacked: $(DL_DIR)/$(BIND_SOURCE) $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked (cd $(BIND_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 38777feba..2a764e0eb 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -24,8 +24,7 @@ $(BISON_DIR)/.unpacked: $(DL_DIR)/$(BISON_SOURCE) $(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked (cd $(BISON_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ gt_cv_func_gnugettext2_libintl=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/boa/boa.mk b/package/boa/boa.mk index 08d73fe15..c8bf8c426 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -28,9 +28,7 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked #CONFIG_SITE=package/boa/boa-config.site-$(ARCH) (cd $(BOA_WORKDIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - CPPFLAGS="$(SED_CFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ $(BOA_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk index 38fce875d..5ca3b8300 100644 --- a/package/bridge/bridge.mk +++ b/package/bridge/bridge.mk @@ -21,8 +21,7 @@ $(BRIDGE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BRIDGE_SOURCE) $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked (cd $(BRIDGE_BUILD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index ec5f6cac9..a4ddb28a9 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -10,12 +10,6 @@ CAIRO_CAT:=$(ZCAT) CAIRO_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION) CAIRO_BINARY:=libcairo.a -ifeq ($(BR2_ENDIAN),"BIG") -CAIRO_BE:=yes -else -CAIRO_BE:=no -endif - $(DL_DIR)/$(CAIRO_SOURCE): $(WGET) -P $(DL_DIR) $(CAIRO_SITE)/$(CAIRO_SOURCE) @@ -30,9 +24,7 @@ $(CAIRO_DIR)/.unpacked: $(DL_DIR)/$(CAIRO_SOURCE) $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked (cd $(CAIRO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_c_bigendian=$(CAIRO_BE) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index ef6afe198..1bf29acb5 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -27,8 +27,7 @@ $(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked (cd $(COREUTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_strtod=yes \ ac_fsusage_space=yes \ fu_cv_sys_stat_statfs2_bsize=yes \ diff --git a/package/curl/curl.mk b/package/curl/curl.mk index 05cc2fb50..7b292d379 100644 --- a/package/curl/curl.mk +++ b/package/curl/curl.mk @@ -26,6 +26,7 @@ $(CURL_DIR)/.configured: $(CURL_DIR)/.unpacked libtoolize --force; \ ./reconf; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 73dd62c28..f7ada9105 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -54,8 +54,7 @@ endif $(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked (cd $(CVS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ cvs_cv_func_printf_ptr=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 827db855e..5ce80493a 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -28,8 +28,7 @@ $(DASH_DIR)/.unpacked: $(DL_DIR)/$(DASH_SOURCE) $(DL_DIR)/$(DASH_PATCH1) $(DASH_DIR)/.configured: $(DASH_DIR)/.unpacked (cd $(DASH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 30f91f16e..042bd87f2 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -24,6 +24,7 @@ $(DBUS_GLIB_DIR)/.unpacked: $(DL_DIR)/$(DBUS_GLIB_SOURCE) $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config (cd $(DBUS_GLIB_DIR); rm -rf config.cache; autoconf ; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_have_abstract_sockets=yes \ ac_cv_func_posix_getpwnam_r=yes \ have_abstract_sockets=yes \ diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 289811dda..63b4d9dca 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -23,9 +23,8 @@ $(DBUS_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE) $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked (cd $(DBUS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_have_abstract_sockets=yes \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index ec219e737..4899a70c9 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -33,7 +33,10 @@ $(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP_SOURCE) touch $(DHCP_DIR)/.unpacked $(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked - (cd $(DHCP_DIR); $(TARGET_CONFIGURE_OPTS) ./configure ); + (cd $(DHCP_DIR); \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure ); touch $(DHCP_DIR)/.configured $(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 219b5dbdb..677b37b8e 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -28,8 +28,7 @@ $(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE) $(DL_DIR)/$(DIALOG_PATCH1) $(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source (cd $(DIALOG_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index d9e720313..f58ea955b 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -24,8 +24,7 @@ $(DIFFUTILS_DIR)/.unpacked: $(DL_DIR)/$(DIFFUTILS_SOURCE) $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked (cd $(DIFFUTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_strtod=yes \ ac_fsusage_space=yes \ fu_cv_sys_stat_statfs2_bsize=yes \ diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 9c2835690..8b43f5ea1 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -20,8 +20,7 @@ $(DILLO_DIR)/.unpacked: $(DL_DIR)/$(DILLO_SOURCE) $(DILLO_DIR)/.configured: $(DILLO_DIR)/.unpacked (cd $(DILLO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index d1443d7bf..bbef83559 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -21,7 +21,8 @@ $(DIRECTFB_DIR)/.unpacked: $(DL_DIR)/$(DIRECTFB_SOURCE) $(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked (cd $(DIRECTFB_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS)" \ ac_cv_header_linux_wm97xx_h=no \ diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 1da002655..941b581d7 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -23,8 +23,7 @@ $(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked (cd $(DISTCC_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/dm/dm.mk b/package/dm/dm.mk index 9936f8b1b..80b8a4442 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -50,8 +50,7 @@ $(DM_DIR)/.unpacked: $(DL_DIR)/$(DM_SOURCE) $(DM_DIR)/.configured: $(DM_DIR)/.unpacked (cd $(DM_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_have_decl_malloc=yes \ gl_cv_func_malloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index ba0c063ff..f044f85c3 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -42,6 +42,7 @@ endif $(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked (cd $(DMALLOC_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="-g $(TARGET_CFLAGS)" \ LDFLAGS="-g $(TARGET_LDFLAGS)" \ ./configure \ diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 2c4731a9e..be89acc48 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -26,8 +26,7 @@ $(DMRAID_DIR)/.unpacked: $(DL_DIR)/$(DMRAID_SOURCE) $(DMRAID_DIR)/.configured: $(DMRAID_DIR)/.unpacked (cd $(DMRAID_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index ec73fc683..3e5b99164 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -27,8 +27,7 @@ $(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.unpacked (cd $(DROPBEAR_DIR); rm -rf config.cache; \ autoconf; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index e8af6200f..d6ead0ff6 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -29,8 +29,7 @@ $(E2FSPROGS_DIR)/.unpacked: $(DL_DIR)/$(E2FSPROGS_SOURCE) $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked (cd $(E2FSPROGS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ed/ed.mk b/package/ed/ed.mk index b3d2d5de1..da257c1b5 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -31,8 +31,7 @@ $(ED_DIR)/.unpacked: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH) $(ED_DIR)/.configured: $(ED_DIR)/.unpacked (cd $(ED_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 5214e0e97..95ea244f2 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -20,8 +20,7 @@ $(ETHTOOL_DIR)/.unpacked: $(DL_DIR)/$(ETHTOOL_SOURCE) $(ETHTOOL_DIR)/.configured: $(ETHTOOL_DIR)/.unpacked (cd $(ETHTOOL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 8ee57de1e..060a09389 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -26,6 +26,7 @@ $(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE) $(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked (cd $(EXPAT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index ac7f6f32d..f88310bfb 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -72,8 +72,7 @@ $(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked mkdir -p $(FAKEROOT_DIR2) (cd $(FAKEROOT_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ $(FAKEROOT_SOURCE_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/file/file.mk b/package/file/file.mk index bdff73dcc..c23c038e2 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -61,8 +61,7 @@ $(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked mkdir -p $(FILE_DIR2) (cd $(FILE_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ $(FILE_SOURCE_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 14d3234a3..fb34a5686 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -25,8 +25,7 @@ $(FINDUTILS_DIR)/.unpacked: $(DL_DIR)/$(FINDUTILS_SOURCE) $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked (cd $(FINDUTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_setvbuf_reversed=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 5c3fc7332..882ee5847 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -35,8 +35,7 @@ endif $(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked (cd $(FLEX_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index fc964d23b..0a83fbe18 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -31,9 +31,8 @@ $(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE) $(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked (cd $(FONTCONFIG_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) " \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ BUILD_CFLAGS="-O2 -I$(FREETYPE_HOST_DIR)/include/freetype2 -I$(FREETYPE_HOST_DIR)/include" \ ac_cv_func_mmap_fixed_mapped=yes \ ./configure \ diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index bd4777357..f98e4e34b 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -23,10 +23,9 @@ $(FREETYPE_DIR)/.unpacked: $(DL_DIR)/$(FREETYPE_SOURCE) # freetype for the target $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked (cd $(FREETYPE_DIR); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) " \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ./configure \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 1969af14d..7a83c0c77 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -25,8 +25,7 @@ $(GAWK_DIR)/.unpacked: $(DL_DIR)/$(GAWK_SOURCE) $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked (cd $(GAWK_DIR); rm -rf config.cache; autoconf; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_getpgrp_void=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index c631cd7d7..cebff42e1 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -28,8 +28,7 @@ endif $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked (cd $(GETTEXT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_strtod=yes \ ac_fsusage_space=yes \ fu_cv_sys_stat_statfs2_bsize=yes \ diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index d928abc26..c1f155522 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -13,12 +13,6 @@ GMP_BINARY:=libgmp$(LIBTGTEXT) GMP_HOST_BINARY:=libgmp$(HOST_SHREXT) GMP_LIBVERSION:=3.4.1 -ifeq ($(BR2_ENDIAN),"BIG") -GMP_BE:=yes -else -GMP_BE:=no -endif - # this is a workaround for a bug in GMP, please see # http://gmplib.org/list-archives/gmp-devel/2006-April/000618.html ifeq ($(HOST_EXEEXT),.exe) @@ -40,8 +34,8 @@ $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked mkdir -p $(GMP_TARGET_DIR) (cd $(GMP_TARGET_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ $(GMP_CPP_FLAGS) \ - ac_cv_c_bigendian=$(GMP_BE) \ $(GMP_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 18df66b74..5a1b7d651 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -26,8 +26,7 @@ $(GNUGREP_DIR)/.unpacked: $(DL_DIR)/$(GNUGREP_SOURCE) $(GNUGREP_DIR)/.configured: $(GNUGREP_DIR)/.unpacked (cd $(GNUGREP_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index c8ffa5dc6..61d759ea3 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -10,10 +10,9 @@ GTK2_ENGINES_CAT:=$(BZCAT) GTK2_ENGINES_DIR:=$(BUILD_DIR)/gtk-engines-$(GTK2_ENGINES_VERSION) GTK2_ENGINES_BINARY:=libclearlooks.so -GTK2_ENGINES_BUILD_ENV=$(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_func_mmap_fixed_mapped=yes \ +GTK2_ENGINES_BUILD_ENV= \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 9483bc775..859e1a357 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -24,8 +24,7 @@ $(GZIP_DIR)/.unpacked: $(DL_DIR)/$(GZIP_SOURCE) $(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked (cd $(GZIP_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 130d0da46..094fe53da 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -32,8 +32,8 @@ $(HAL_DIR)/.unpacked: $(DL_DIR)/$(HAL_SOURCE) $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config (cd $(HAL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/lib/glib-2.0/include" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ GLIB_CFLAGS="$(GLIB_CFLAGS)" \ GLIB_LIBS="$(GLIB_LIBS)" \ DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \ diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index f02a6d486..59c343cec 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -20,8 +20,7 @@ $(HASERL_DIR)/.unpacked: $(DL_DIR)/$(HASERL_SOURCE) $(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked (cd $(HASERL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index f7f143b2f..099df749d 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -19,10 +19,9 @@ $(IPERF_DIR)/.unpacked: $(DL_DIR)/$(IPERF_SOURCE) touch $(IPERF_DIR)/.unpacked $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked - ( cd $(IPERF_DIR); rm -rf config.cache; \ + (cd $(IPERF_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --with-gnu-ld \ diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 52e53f25a..125e1695c 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -69,7 +69,8 @@ $(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) $(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched ( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache ; \ - $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index c6b8fa089..5f59e36b4 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -39,8 +39,7 @@ $(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE) $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked (cd $(JPEG_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 9ab256cef..0abecaf9e 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -43,8 +43,7 @@ endif $(KEXEC_DIR)/.configured: $(KEXEC_DIR)/.unpacked (cd $(KEXEC_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/less/less.mk b/package/less/less.mk index 420aefbb5..a976b2000 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -20,8 +20,7 @@ $(LESS_DIR)/.source: $(DL_DIR)/$(LESS_SOURCE) $(LESS_DIR)/.configured: $(LESS_DIR)/.source (cd $(LESS_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 4d0666ed2..4be64b8f7 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -21,8 +21,7 @@ $(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE) $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source (cd $(LIBCGI_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 26e7da26c..72a2c8448 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -22,8 +22,7 @@ $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE) $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked (cd $(LIBCGICC_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) " \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index ab02c950f..7143b5581 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -29,11 +29,9 @@ $(LIBDAEMON_DIR)/.unpacked: $(DL_DIR)/$(LIBDAEMON_SOURCE) $(LIBDAEMON_DIR)/.configured: $(LIBDAEMON_DIR)/.unpacked (cd $(LIBDAEMON_DIR) && rm -rf config.cache && autoconf) - ( \ - cd $(LIBDAEMON_DIR) && \ + ( cd $(LIBDAEMON_DIR) && \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 16d48f588..4876fa999 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -25,8 +25,7 @@ $(LIBELF_DIR)/.unpacked: $(DL_DIR)/$(LIBELF_SOURCE) $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.unpacked (cd $(LIBELF_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ libelf_cv_working_memmove=yes \ mr_cv_target_elf=yes \ ./configure \ diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 93f7eb631..953b4da0c 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -25,8 +25,7 @@ $(LIBEVENT_DIR)/.unpacked: $(DL_DIR)/$(LIBEVENT_SOURCE) $(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked (cd $(LIBEVENT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 47de02082..9b738d070 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -9,12 +9,6 @@ LIBGLIB12_CAT:=$(ZCAT) LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10 LIBGLIB12_BINARY:=libglib.a -ifeq ($(BR2_ENDIAN),"BIG") -LIBGLIB12_BE:=yes -else -LIBGLIB12_BE:=no -endif - $(DL_DIR)/$(LIBGLIB12_SOURCE): $(WGET) -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE) @@ -29,9 +23,7 @@ $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked (cd $(LIBGLIB12_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_c_bigendian=$(LIBGLIB12_BE) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 741aded5f..01e647d25 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -10,12 +10,6 @@ LIBGLIB2_CAT:=$(BZCAT) LIBGLIB2_DIR:=$(BUILD_DIR)/glib-$(LIBGLIB2_VERSION) LIBGLIB2_BINARY:=libglib-2.0.a -ifeq ($(BR2_ENDIAN),"BIG") -LIBGLIB2_BE:=yes -else -LIBGLIB2_BE:=no -endif - $(DL_DIR)/$(LIBGLIB2_SOURCE): $(WGET) -P $(DL_DIR) $(LIBGLIB2_SITE)/$(LIBGLIB2_SOURCE) @@ -31,9 +25,7 @@ $(LIBGLIB2_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB2_SOURCE) $(LIBGLIB2_DIR)/.configured: $(LIBGLIB2_DIR)/.unpacked (cd $(LIBGLIB2_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_c_bigendian=$(LIBGLIB2_BE) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index 76d1175ed..5fc5e6f87 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -24,10 +24,8 @@ $(LIBGTK12_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK12_SOURCE) $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked (cd $(LIBGTK12_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \ - ac_cv_func_mmap_fixed_mapped=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 4785b516a..d2411c65f 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -10,10 +10,9 @@ LIBGTK2_CAT:=$(BZCAT) LIBGTK2_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK2_VERSION) LIBGTK2_BINARY:=libgtk-x11-2.0.a -LIBGTK2_BUILD_ENV=$(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_func_mmap_fixed_mapped=yes \ +LIBGTK2_BUILD_ENV= \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk index 3c1b5ac6a..2bdb544ec 100644 --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@ -20,8 +20,7 @@ $(LIBID3TAG_DIR)/.unpacked: $(DL_DIR)/$(LIBID3TAG_SOURCE) $(LIBID3TAG_DIR)/.configured: $(LIBID3TAG_DIR)/.unpacked (cd $(LIBID3TAG_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index fc5ab4a55..5bcfe79f2 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -23,8 +23,7 @@ $(LIBLOCKFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBLOCKFILE_SOURCE) $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked (cd $(LIBLOCKFILE_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 69552737c..65cb07733 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -20,8 +20,7 @@ $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE) $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked (cd $(LIBMAD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 58bc1e67b..b70f90550 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -40,9 +40,7 @@ $(LIBPNG_DIR)/.unpacked: $(DL_DIR)/$(LIBPNG_SOURCE) $(LIBPNG_DIR)/.configured: $(LIBPNG_DIR)/.unpacked (cd $(LIBPNG_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_func_memcmp_working=yes \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_have_decl_malloc=yes \ gl_cv_func_malloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes \ diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index e4d78f8dd..98ac85647 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -19,6 +19,7 @@ $(LIBRAW1394_DIR)/.unpacked: $(DL_DIR)/$(LIBRAW1394_SOURCE) $(LIBRAW1394_DIR)/.configured: $(LIBRAW1394_DIR)/.unpacked (cd $(LIBRAW1394_DIR); rm -rf config.cache ; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 694705fea..ea4801008 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -22,7 +22,7 @@ $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE) $(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.unpacked (cd $(LIBSNDFILE_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index adfad0311..1fc266de3 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -39,15 +39,14 @@ $(LIBSYSFS_DIR)/.unpacked: $(DL_DIR)/$(LIBSYSFS_SOURCE) $(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked (cd $(LIBSYSFS_DIR); rm -rf config.cache ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) " \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --sysconfdir=/etc \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --sysconfdir=/etc \ ); touch $@ diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index f97f9e47d..399ec880e 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -23,8 +23,7 @@ $(LIBTOOL_DIR)/.unpacked: $(DL_DIR)/$(LIBTOOL_SOURCE) $(LIBTOOL_DIR)/.configured: $(LIBTOOL_DIR)/.unpacked (cd $(LIBTOOL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 18120c001..42e33bd8a 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -10,12 +10,6 @@ LIBUSB_DIR:=$(BUILD_DIR)/libusb-$(LIBUSB_VER) LIBUSB_CAT:=$(ZCAT) LIBUSB_BINARY:=usr/lib/libusb.so -ifeq ($(BR2_ENDIAN),"BIG") -LIBUSB_BE:=yes -else -LIBUSB_BE:=no -endif - $(DL_DIR)/$(LIBUSB_SOURCE): $(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) @@ -29,10 +23,8 @@ $(LIBUSB_DIR)/.unpacked: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.unpacked (cd $(LIBUSB_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_header_regex_h=no \ - ac_cv_c_bigendian=$(LIBUSB_BE) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 2b8f6317b..67f500677 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -29,8 +29,7 @@ $(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked (cd $(LIGHTTPD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/links/links.mk b/package/links/links.mk index 344765ae2..f6ce05dee 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -19,8 +19,7 @@ $(LINKS_DIR)/.unpacked: $(DL_DIR)/$(LINKS_SOURCE) $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked (cd $(LINKS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index cf7ea6311..ba0456e28 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -37,8 +37,7 @@ $(LRZSZ_DIR)/.unpacked: $(DL_DIR)/$(LRZSZ_SOURCE) $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked (cd $(LRZSZ_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 48d1a6939..9a8a76977 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -39,10 +39,9 @@ endif touch $@ $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched - (cd $(LTRACE_DIR); \ + (cd $(LTRACE_DIR); rm -rf config.cache ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index 3626c232d..8cc3925b5 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -69,8 +69,7 @@ $(LTT_DIR2)/.unpacked: $(DL_DIR)/$(LTT_SOURCE) $(LTT_DIR2)/.configured: $(LTT_DIR2)/.unpacked (cd $(LTT_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 7d5c834a8..38dc4a3fc 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -45,8 +45,7 @@ $(LVM2_DIR)/.unpacked: $(DL_DIR)/$(LVM2_SOURCE) $(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked (cd $(LVM2_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index c425907e0..e612e0af5 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -61,8 +61,8 @@ $(LZMA_TARGET_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE) $(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.source (cd $(LZMA_TARGET_DIR); rm -f config.cache ;\ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) $(LZMA_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 02077e2d8..b0741d0e5 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -30,8 +30,7 @@ LZO_CONFIG_SHARED:=--disable-shared $(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked (cd $(LZO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/m4/m4.mk b/package/m4/m4.mk index fb06fb1c4..6742f80bb 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -29,8 +29,7 @@ $(M4_DIR)/.unpacked: $(DL_DIR)/$(M4_SOURCE) $(M4_DIR)/.configured: $(M4_DIR)/.unpacked (cd $(M4_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ gl_cv_func_gettimeofday_clobber=no \ $(gl_cv_func_re_compile_pattern_working) \ ./configure \ diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index 5ceae69d4..a7ab97366 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -20,8 +20,7 @@ $(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE) $(MADPLAY_DIR)/.configured: $(MADPLAY_DIR)/.unpacked (cd $(MADPLAY_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/make/make.mk b/package/make/make.mk index ffca96a38..7adf1c52e 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -24,8 +24,7 @@ $(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE) $(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked (cd $(GNUMAKE_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ make_cv_sys_gnu_glob=no \ GLOBINC='-I$(GNUMAKE_DIR)/glob' \ GLOBLIB=glob/libglob.a \ diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 4e1eb56c0..63f258875 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -36,12 +36,10 @@ $(METACITY_DIR)/.unpacked: $(DL_DIR)/$(METACITY_SOURCE) $(DL_DIR)/$(METACITY_SOU $(METACITY_DIR)/.configured: $(METACITY_DIR)/.unpacked (cd $(METACITY_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ PKG_CONFIG=$(STAGING_DIR)/usr/bin/pkg-config \ GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \ - ac_cv_func_mmap_fixed_mapped=yes \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index b51a3209a..55454a49b 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -25,8 +25,7 @@ $(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) $(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked (cd $(MODULE_INIT_TOOLS_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index bdfc5276c..2a0769e27 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -30,8 +30,7 @@ $(MODUTILS_DIR1)/.source: $(DL_DIR)/$(MODUTILS_SOURCE) $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source (cd $(MODUTILS_DIR1); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ INSTALL=$(MODUTILS_DIR1)/install-sh \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 6d6afa578..0c5f07fee 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -15,12 +15,6 @@ MPFR_BINARY:=libmpfr$(LIBTGTEXT) MPFR_HOST_BINARY:=libmpfr$(HOST_SHREXT) MPFR_LIBVERSION:=1.0.1 -ifeq ($(BR2_ENDIAN),"BIG") -MPFR_BE:=yes -else -MPFR_BE:=no -endif - # No patch ifeq ($(MPFR_PATCH),) $(DL_DIR)/$(MPFR_SOURCE): @@ -56,7 +50,7 @@ $(MPFR_TARGET_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/usr/lib/$(G mkdir -p $(MPFR_TARGET_DIR) (cd $(MPFR_TARGET_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - ac_cv_c_bigendian=$(MPFR_BE) \ + $(TARGET_CONFIGURE_ARGS) \ $(MPFR_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 98eab7c86..17fdddd85 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -23,8 +23,7 @@ $(NANO_DIR)/.unpacked: $(DL_DIR)/$(NANO_SOURCE) $(NANO_DIR)/.configured: $(NANO_DIR)/.unpacked (cd $(NANO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_header_regex_h=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 22256c245..1d2c33b46 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -20,8 +20,7 @@ $(NBD_DIR)/.unpacked: $(DL_DIR)/$(NBD_SOURCE) $(NBD_DIR)/.configured: $(NBD_DIR)/.unpacked (cd $(NBD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ CC=$(TARGET_CC) \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 4cd5370a8..62c55c95d 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -26,7 +26,7 @@ $(NCFTP_DIR)/.source: $(DL_DIR)/$(NCFTP_SOURCE) $(NCFTP_DIR)/.configured: $(NCFTP_DIR)/.source (cd $(NCFTP_DIR); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index cf2f077a2..d1967f9f3 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -49,8 +49,7 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched (cd $(NCURSES_DIR); rm -rf config.cache; \ BUILD_CC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 243a58339..9a5166338 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -24,8 +24,7 @@ $(NETCAT_DIR)/.unpacked: $(DL_DIR)/$(NETCAT_SOURCE) $(NETCAT_DIR)/.configured: $(NETCAT_DIR)/.unpacked (cd $(NETCAT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index e30b62f3e..a55b20315 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -35,6 +35,7 @@ $(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked (cd $(NETSNMP_DIR); autoconf; \ ac_cv_CAN_USE_SYSCTL=no \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --with-cc=$(TARGET_CROSS)gcc \ --with-ar=$(TARGET_CROSS)ar \ diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 1a154aeb9..1e1b62deb 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -25,8 +25,8 @@ $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE) $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source (cd $(NEWT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 6f8cd4629..21805d72e 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -33,8 +33,8 @@ $(NFS_UTILS_DIR)/.unpacked: $(DL_DIR)/$(NFS_UTILS_SOURCE) $(NFS_UTILS_DIR)/.configured: $(NFS_UTILS_DIR)/.unpacked (cd $(NFS_UTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) $(BR2_NFS_UTILS_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ knfsd_cv_bsd_signals=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 46270b985..8e08919ae 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -29,6 +29,7 @@ $(NTP_DIR)/.patched: $(DL_DIR)/$(NTP_SOURCE) $(NTP_DIR)/.configured: $(NTP_DIR)/.patched (cd $(NTP_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_lib_md5_MD5Init=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 01f6db14f..2bcbf949f 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -22,6 +22,7 @@ $(OPENNTPD_DIR)/.source: $(DL_DIR)/$(OPENNTPD_SOURCE) $(OPENNTPD_DIR)/.configured: $(OPENNTPD_DIR)/.source (cd $(OPENNTPD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index fb3177395..209f4eac6 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -20,9 +20,7 @@ $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked (cd $(OPENSSH_DIR); rm -rf config.cache; autoconf ; \ $(TARGET_CONFIGURE_OPTS) \ - LD=$(TARGET_CROSS)gcc \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 630fa5f2c..e50c8d095 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -35,8 +35,7 @@ $(OPENVPN_DIR)/.unpacked: $(DL_DIR)/$(OPENVPN_SOURCE) $(OPENVPN_DIR)/.configured: $(OPENVPN_DIR)/.unpacked (cd $(OPENVPN_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 7065ffa36..f71add798 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -11,16 +11,9 @@ PANGO_CAT:=$(BZCAT) PANGO_DIR:=$(BUILD_DIR)/pango-$(PANGO_VERSION) PANGO_BINARY:=libpango-1.0.a -ifeq ($(BR2_ENDIAN),"BIG") -PANGO_BE:=yes -else -PANGO_BE:=no -endif - -PANGO_BUILD_ENV=$(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ac_cv_c_bigendian=$(PANGO_BE) \ +PANGO_BUILD_ENV= \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ diff --git a/package/patch/patch.mk b/package/patch/patch.mk index f0b47e4e8..6871d80b0 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -22,7 +22,7 @@ $(GNUPATCH_DIR)/.unpacked: $(DL_DIR)/$(GNUPATCH_SOURCE) $(GNUPATCH_DIR)/.configured: $(GNUPATCH_DIR)/.unpacked (cd $(GNUPATCH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index ba1f8cbdd..26cab47b2 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -31,8 +31,7 @@ $(PPPD_DIR)/.unpacked: $(DL_DIR)/$(PPPD_SOURCE) $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked (cd $(PPPD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index fb61a5d62..2f144dc48 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -23,8 +23,7 @@ $(PROFTPD_DIR)/.unpacked: $(DL_DIR)/$(PROFTPD_SOURCE) $(PROFTPD_DIR)/.configured: $(PROFTPD_DIR)/.unpacked (cd $(PROFTPD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ac_cv_func_setpgrp_void=yes \ ac_cv_func_setgrent_void=yes \ ./configure \ diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index ccb7bf90e..8e6be504b 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -20,8 +20,7 @@ $(PSMISC_DIR)/.unpacked: $(DL_DIR)/$(PSMISC_SOURCE) $(PSMISC_DIR)/.configured: $(PSMISC_DIR)/.unpacked (cd $(PSMISC_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/python/python.mk b/package/python/python.mk index 17d6a1452..e831aa0f2 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -44,6 +44,7 @@ $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython (cd $(PYTHON_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ OPT="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/qte/qte.mk b/package/qte/qte.mk index 8c8482d6b..38dee5be7 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -137,8 +137,7 @@ $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked cp $(QTE_QTOPIA_DIR)/src/qt/qconfig-qpe.h $(QTE_QTE_DIR)/src/tools/ (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ $(QTE_QTE_CONFIGURE) -qconfig qpe -keypad-mode -qvfb -depths 4,8,16,32 -xplatform $(BR2_QTE_CROSS_PLATFORM) \ ); diff --git a/package/raidtools/raidtools.mk b/package/raidtools/raidtools.mk index 1ecbbc60b..9dc3ca121 100644 --- a/package/raidtools/raidtools.mk +++ b/package/raidtools/raidtools.mk @@ -21,9 +21,8 @@ $(RAIDTOOLS2_DIR)/.unpacked: $(DL_DIR)/$(RAIDTOOLS2_SOURCE) $(RAIDTOOLS2_DIR)/.configured: $(RAIDTOOLS2_DIR)/.unpacked (cd $(RAIDTOOLS2_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 8214d5dff..3bca0542a 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -21,8 +21,7 @@ $(RDESKTOP_DIR)/.unpacked: $(DL_DIR)/$(RDESKTOP_SOURCE) $(RDESKTOP_DIR)/.configured: $(RDESKTOP_DIR)/.unpacked (cd $(RDESKTOP_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 8606ab753..0043419e5 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -26,8 +26,7 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked (cd $(READLINE_DIR); rm -rf config.cache; \ bash_cv_func_sigsetjmp=yes \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index c3dee21a5..cd98425cd 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -24,8 +24,7 @@ $(RSYNC_DIR)/.unpacked: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked (cd $(RSYNC_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 7c873c025..7fef9a5a2 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -24,8 +24,7 @@ $(RUBY_DIR)/.unpacked: $(DL_DIR)/$(RUBY_SOURCE) $(RUBY_DIR)/.configured: $(RUBY_DIR)/.unpacked (cd $(RUBY_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index efe4bdb3b..e4932a63d 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -40,8 +40,7 @@ $(RXVT_DIR)/.unpacked: $(DL_DIR)/$(RXVT_SOURCE) $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked (cd $(RXVT_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ rxvt_cv_ptys=GLIBC \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 353615f87..9eabfec59 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -25,8 +25,7 @@ $(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked (cd $(SAMBA_DIR); rm -rf config.cache; \ ./autogen.sh; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \ samba_cv_USE_SETREUID=yes \ ./configure \ diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 235b46940..10329d951 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -21,8 +21,9 @@ $(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE) $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked (cd $(SDL_DIR); rm -rf config.cache ; \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 70bccea0a..24b7036c9 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -96,8 +96,7 @@ $(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE) $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked (cd $(SED_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ CPPFLAGS="$(SED_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 387af08eb..6809254b0 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -43,8 +43,8 @@ endif $(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked (cd $(SETSERIAL_DIR); rm -rf config.cache ; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) $(SETSERIAL_CFLAGS)" \ - 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 70a39f65e..b666ba3b3 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -26,8 +26,7 @@ $(SMARTMONTOOLS_DIR)/.unpacked: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) $(SMARTMONTOOLS_DIR)/.configured: $(SMARTMONTOOLS_DIR)/.unpacked (cd $(SMARTMONTOOLS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 092a53dc0..848e8a35e 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -29,8 +29,7 @@ $(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked mkdir -p $(SOCAT_WORKDIR) (cd $(SOCAT_WORKDIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ $(SOCAT_DIR)/configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 7c8fad1de..66df044c1 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -20,6 +20,7 @@ $(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE) $(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked (cd $(SQLITE_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ config_BUILD_CC="$(HOSTCC)" \ config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \ config_TARGET_CC="$(TARGET_CC)" \ diff --git a/package/strace/strace.mk b/package/strace/strace.mk index ed99cac61..35a23d2cf 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -29,8 +29,8 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked (cd $(STRACE_DIR); rm -rf config.cache; \ $(if $(BR_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no) \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ CFLAGS="$(TARGET_CFLAGS) $(BR2_STRACE_CFLAGS)" \ - 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 bbda01740..8ce852781 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -24,8 +24,7 @@ $(STUNNEL_DIR)/.unpacked: $(DL_DIR)/$(STUNNEL_SOURCE) $(STUNNEL_DIR)/.configured: $(STUNNEL_DIR)/.unpacked (cd $(STUNNEL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ 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 3f0df7af0..a14b6d4bf 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -23,6 +23,7 @@ $(SUDO_DIR)/.unpacked: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_DIR)/.configured: $(SUDO_DIR)/.unpacked $(SUDO_CONFIG_FILE) (cd $(SUDO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 146d86979..b2f94a985 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -24,8 +24,7 @@ $(GNUTAR_DIR)/.unpacked: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked (cd $(GNUTAR_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ 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 2a29c07dd..143a158fd 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -19,8 +19,7 @@ $(TCL_DIR)/.source: $(DL_DIR)/$(TCL_SOURCE) $(TCL_DIR)/.configured: $(TCL_DIR)/.source (cd $(TCL_DIR)/unix; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index b4f9c4ef9..37e66b01c 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -26,8 +26,7 @@ $(DHCPDUMP_DIR)/.configured: $(DHCPDUMP_DIR)/.unpacked cd $(DHCPDUMP_DIR) ; \ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 323383dfc..9c60e7ee8 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -28,8 +28,7 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 59d604ff5..52d6b94c6 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -24,8 +24,7 @@ $(TFTP_HPA_DIR)/.unpacked: $(DL_DIR)/$(TFTP_HPA_SOURCE) $(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)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index f49b10de6..52dccb9fc 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -25,8 +25,7 @@ $(THTTPD_DIR)/.unpacked: $(DL_DIR)/$(THTTPD_SOURCE) $(THTTPD_DIR)/.configured: $(THTTPD_DIR)/.unpacked (cd $(THTTPD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 9d1d1ab7d..018c64540 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -23,8 +23,7 @@ $(TIFF_DIR)/.unpacked: $(DL_DIR)/$(TIFF_SOURCE) $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked (cd $(TIFF_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 5515e7560..42f272dad 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -13,8 +13,7 @@ $(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE) $(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist (cd $(TN5250_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 391008e72..ffb2f57f5 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -24,8 +24,7 @@ $(USBUTILS_DIR)/.unpacked: $(DL_DIR)/$(USBUTILS_SOURCE) $(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)" \ + $(TARGET_CONFIGURE_ARGS) \ 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 85ef7a60b..161c173c2 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -25,8 +25,7 @@ endif $(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)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --prefix=/usr \ diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index d4083e2c4..e7deb81af 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -24,8 +24,7 @@ $(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched (cd $(VALGRIND_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 6a8a4ffa9..3c5092cf6 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -27,8 +27,7 @@ $(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE) $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked (cd $(VTUN_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/wget/wget.mk b/package/wget/wget.mk index c1d0b461c..d6e832087 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -23,8 +23,7 @@ $(WGET_DIR)/.unpacked: $(DL_DIR)/$(WGET_SOURCE) $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked (cd $(WGET_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/which/which.mk b/package/which/which.mk index a87c14f4b..60d59b104 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -23,8 +23,7 @@ $(WHICH_DIR)/.unpacked: $(DL_DIR)/$(WHICH_SOURCE) $(WHICH_DIR)/.configured: $(WHICH_DIR)/.unpacked (cd $(WHICH_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index d74825671..1e7481490 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -34,7 +34,7 @@ XFSPROGS_CONFIG_SHARED:=--enable-shared $(XFSPROGS_DIR)/.configured: $(XFSPROGS_DIR)/.unpacked (cd $(XFSPROGS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_CONFIGURE_ARGS) \ CPPFLAGS=-I$(E2FSPROGS_DIR)/lib \ LDFLAGS="$(TARGET_LDFLAGS) -L$(E2FSPROGS_DIR)/lib" \ LIBTOOL=$(LIBTOOL_DIR)/libtool \ |