- use centralized DISABLE_LARGEFILE

- nil CXX if there isn't one

diff --git a/package/Makefile.in b/package/Makefile.in
index aeb56d737af394c448a6244ad78bab84066a6dc0..1e10e4c1b5de5239aa7882424cb499a4a9abce6d 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -16,11 +16,6 @@ TAR_OPTIONS=$(subst ",, $(BR2_TAR_OPTIONS)) -xf
 #")
 
 
-
-
-ifneq ($(BR2_LARGEFILE),y)
-DISABLE_LARGEFILE= --disable-largefile
-endif
 TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 HOSTCC:=gcc
 HOSTCXX:=g++
@@ -101,4 +96,11 @@ else
 DISABLE_NLS:=--disable-nls
 endif
 
+ifneq ($(BR2_LARGEFILE),y)
+DISABLE_LARGEFILE= --disable-largefile
+endif
+
+ifeq ($(BR2_INSTALL_LIBSTDCPP),)
+TARGET_CONFIGURE_OPTS+=CXX=""
+endif
 

diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index 9eab1dceda20c227c500b93ca9f319720bad5423..5291b9971358e467f85d53f997eb4974c2453fda 100644 (file)
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -36,14 +36,10 @@ $(LIBSYSFS_DIR)/.unpacked: $(DL_DIR)/$(LIBSYSFS_SOURCE)
        $(LIBSYSFS_CAT) $(DL_DIR)/$(LIBSYSFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
        touch $(LIBSYSFS_DIR)/.unpacked
 
-ifeq ($(BR2_INSTALL_LIBSTDCPP),)
-LIBSYSFS_CXX:=CXX=""
-endif
 $(LIBSYSFS_DIR)/.configured: $(LIBSYSFS_DIR)/.unpacked
        (cd $(LIBSYSFS_DIR); \
        $(TARGET_CONFIGURE_OPTS) \
        CFLAGS="$(TARGET_CFLAGS) " \
-       $(LIBSYSFS_CXX) \
        ./configure \
        --target=$(GNU_TARGET_NAME) \
        --host=$(GNU_TARGET_NAME) \

diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 12614d8600fec1c1b157a92f0b544228f7c21e81..1541a0f9b99e321e847e27c1f471764191256a6e 100644 (file)
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -34,15 +34,11 @@ ifneq ($(MPFR_PATCH),)
 endif
        touch $(MPFR_DIR)/.unpacked
 
-ifeq ($(BR2_INSTALL_LIBSTDCPP),)
-MPFR_CXX:=CXX=""
-endif
 $(MPFR_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/lib/$(GMP_BINARY)
        (cd $(MPFR_DIR); rm -rf config.cache; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ac_cv_c_bigendian=$(MPFR_BE) \
-               $(MPFR_CXX) \
                ./configure \
                --host=$(REAL_GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \