From 3c9baee374857de425a0e14f0f13ad27491006be Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Thu, 21 Dec 2006 13:51:53 +0000
Subject: [PATCH] - use centralized DISABLE_LARGEFILE - nil CXX if there isn't
 one

---
 package/Makefile.in          | 12 +++++++-----
 package/libsysfs/libsysfs.mk |  4 ----
 package/mpfr/mpfr.mk         |  4 ----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index aeb56d737a..1e10e4c1b5 100644
--- 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 9eab1dceda..5291b99713 100644
--- 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 12614d8600..1541a0f9b9 100644
--- 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) \