]> rtime.felk.cvut.cz Git - coffee/buildroot.git/blobdiff - package/Makefile.in
log4cplus: add C++11 dependencies
[coffee/buildroot.git] / package / Makefile.in
index a63a2e85756113a0783388cf579ac3de1f39f5a9..4325f7b3a905af5fdb62a840cad2cc79d27983ec 100644 (file)
@@ -6,7 +6,7 @@ HOSTMAKE = $(MAKE)
 endif
 HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 
-# If BR2_LEVEL is 0, scale the maximum concurrency with the number of
+# If BR2_JLEVEL is 0, scale the maximum concurrency with the number of
 # CPUs. An additional job is used in order to keep processors busy
 # while waiting on I/O.
 # If the number of processors is not available, assume one.
@@ -18,7 +18,8 @@ PARALLEL_JOBS := $(BR2_JLEVEL)
 endif
 
 MAKE1 := $(HOSTMAKE) -j1
-MAKE := $(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS))
+override MAKE = $(HOSTMAKE) \
+       $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_VENDOR = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_VENDOR))
@@ -90,7 +91,7 @@ endif
 # code size and performance, the linker can usually optimize away the
 # overhead when a call ends up within a certain range.
 #
-# Use text-section-literals for Xtensa globally.
+# Use auto-litpools for Xtensa globally.
 # Collecting literals into separate section can be advantageous if that
 # section is placed into DTCM at link time. This is applicable for code
 # running on bare metal, but makes no sense under linux, where userspace
@@ -99,32 +100,36 @@ endif
 # instruction can only access literals in 256 KBytes range.
 #
 ifeq ($(BR2_xtensa),y)
-TARGET_ABI += -mlongcalls -mtext-section-literals
+TARGET_ABI += -mlongcalls -mauto-litpools
 endif
 
 ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy)
 TARGET_ABI += -matomic
 endif
 
-STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot
+STAGING_SUBDIR = $(GNU_TARGET_NAME)/sysroot
 STAGING_DIR    = $(HOST_DIR)/$(STAGING_SUBDIR)
 
-TARGET_OPTIMIZATION := $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
-
 ifeq ($(BR2_OPTIMIZE_0),y)
-TARGET_OPTIMIZATION += -O0
+TARGET_OPTIMIZATION = -O0
 endif
 ifeq ($(BR2_OPTIMIZE_1),y)
-TARGET_OPTIMIZATION += -O1
+TARGET_OPTIMIZATION = -O1
 endif
 ifeq ($(BR2_OPTIMIZE_2),y)
-TARGET_OPTIMIZATION += -O2
+TARGET_OPTIMIZATION = -O2
 endif
 ifeq ($(BR2_OPTIMIZE_3),y)
-TARGET_OPTIMIZATION += -O3
+TARGET_OPTIMIZATION = -O3
+endif
+ifeq ($(BR2_OPTIMIZE_G),y)
+TARGET_OPTIMIZATION = -Og
 endif
 ifeq ($(BR2_OPTIMIZE_S),y)
-TARGET_OPTIMIZATION += -Os
+TARGET_OPTIMIZATION = -Os
+endif
+ifeq ($(BR2_OPTIMIZE_FAST),y)
+TARGET_OPTIMIZATION = -Ofast
 endif
 ifeq ($(BR2_DEBUG_1),y)
 TARGET_DEBUGGING = -g1
@@ -136,42 +141,59 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING = -g3
 endif
 
-ifeq ($(BR2_LARGEFILE),y)
-TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+TARGET_CFLAGS_RELRO = -Wl,-z,relro
+TARGET_CFLAGS_RELRO_FULL = -Wl,-z,now $(TARGET_CFLAGS_RELRO)
+
+TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
+
+ifeq ($(BR2_SSP_REGULAR),y)
+TARGET_CPPFLAGS += -fstack-protector
+else ifeq ($(BR2_SSP_STRONG),y)
+TARGET_CPPFLAGS += -fstack-protector-strong
+else ifeq ($(BR2_SSP_ALL),y)
+TARGET_CPPFLAGS += -fstack-protector-all
+endif
+
+ifeq ($(BR2_RELRO_PARTIAL),y)
+TARGET_CPPFLAGS += $(TARGET_CFLAGS_RELRO)
+TARGET_LDFLAGS += $(TARGET_CFLAGS_RELRO)
+else ifeq ($(BR2_RELRO_FULL),y)
+TARGET_CPPFLAGS += -fPIE $(TARGET_CFLAGS_RELRO_FULL)
+TARGET_LDFLAGS += -pie
+endif
+
+ifeq ($(BR2_FORTIFY_SOURCE_1),y)
+TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=1
+else ifeq ($(BR2_FORTIFY_SOURCE_2),y)
+TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=2
 endif
 
+TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
-TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
+TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 
 ifeq ($(BR2_BINFMT_FLAT),y)
 TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
        -Wl$(comma)-elf2flt)
 TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
        -Wl$(comma)-elf2flt)
-TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-elf2flt)
+TARGET_FCFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
+       -Wl$(comma)-elf2flt)
+TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt)
 endif
 
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
+TARGET_FCFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0
 endif
-ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
-TARGET_LDFLAGS += -msep-data
-TARGET_CFLAGS += -msep-data
-TARGET_CXXFLAGS += -msep-data
-endif
-
-ifeq ($(BR2_ENABLE_SSP),y)
-TARGET_CFLAGS += -fstack-protector-all
-TARGET_CXXFLAGS += -fstack-protector-all
-endif
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
+TARGET_CROSS = $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-
 else
-TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
+TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 endif
 
 # Define TARGET_xx variables for all common binutils/gcc
@@ -188,133 +210,127 @@ TARGET_READELF  = $(TARGET_CROSS)readelf
 TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
 TARGET_OBJDUMP  = $(TARGET_CROSS)objdump
 
-TARGET_CC_NOCCACHE  := $(TARGET_CC)
-TARGET_CXX_NOCCACHE := $(TARGET_CXX)
-
-ifeq ($(BR2_CCACHE),y)
-TARGET_CC  := $(CCACHE) $(TARGET_CC)
-TARGET_CXX := $(CCACHE) $(TARGET_CXX)
-endif
-
 ifeq ($(BR2_STRIP_strip),y)
 STRIP_STRIP_DEBUG := --strip-debug
-STRIP_STRIP_UNNEEDED := --strip-unneeded
-STRIP_STRIP_ALL := --strip-all
 TARGET_STRIP = $(TARGET_CROSS)strip
 STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
-KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
-endif
-ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_STRIP_DEBUG :=
-STRIP_STRIP_UNNEEDED :=
-STRIP_STRIP_ALL :=
-TARGET_STRIP = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
-STRIPCMD = $(TARGET_STRIP)
-KSTRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
-endif
-ifeq ($(BR2_STRIP_none),y)
-TARGET_STRIP = true
+else
+TARGET_STRIP = /bin/true
 STRIPCMD = $(TARGET_STRIP)
-KSTRIPCMD = $(TARGET_STRIP)
 endif
 INSTALL := $(shell which install || type -p install)
 FLEX := $(shell which flex || type -p flex)
 BISON := $(shell which bison || type -p bison)
-SED := $(shell which sed || type -p sed) -i -e
 UNZIP := $(shell which unzip || type -p unzip) -q
 
-APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)
+APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
 
-HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
+HOST_CPPFLAGS  = -I$(HOST_DIR)/include
 HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
-HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
+HOST_LDFLAGS  += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib
+
+# The macros below are taken from linux 4.11 and adapted slightly.
+# Copy more when needed.
+
+# try-run
+# Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise)
+# Exit code chooses option. "$$TMP" is can be used as temporary file and
+# is automatically cleaned up.
+try-run = $(shell set -e;               \
+       TMP="$$(tempfile)";             \
+       if ($(1)) >/dev/null 2>&1;      \
+       then echo "$(2)";               \
+       else echo "$(3)";               \
+       fi;                             \
+       rm -f "$$TMP")
+
+# host-cc-option
+# Usage: HOST_FOO_CFLAGS += $(call host-cc-option,-no-pie,)
+host-cc-option = $(call try-run,\
+        $(HOSTCC) $(HOST_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
 
-# hostcc version as an integer - E.G. 4.3.2 => 432
-HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \
-       sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
 
 # host-intltool should be executed with the system perl, so we save
 # the path to the system perl, before a host-perl built by Buildroot
-# might get installed into $(HOST_DIR)/usr/bin and therefore appears
+# might get installed into $(HOST_DIR)/bin and therefore appears
 # in our PATH. This system perl will be used as INTLTOOL_PERL.
 export PERL=$(shell which perl)
 
 # host-intltool needs libxml-parser-perl, which Buildroot installs in
-# $(HOST_DIR)/usr/lib/perl, so we must make sure that the system perl
+# $(HOST_DIR)/lib/perl, so we must make sure that the system perl
 # finds this perl module by exporting the proper value for PERL5LIB.
-export PERL5LIB=$(HOST_DIR)/usr/lib/perl
-
-TARGET_CONFIGURE_OPTS = PATH=$(BR_PATH) \
-               AR="$(TARGET_AR)" \
-               AS="$(TARGET_AS)" \
-               LD="$(TARGET_LD)" \
-               NM="$(TARGET_NM)" \
-               CC="$(TARGET_CC)" \
-               GCC="$(TARGET_CC)" \
-               CPP="$(TARGET_CPP)" \
-               CXX="$(TARGET_CXX)" \
-               FC="$(TARGET_FC)" \
-               RANLIB="$(TARGET_RANLIB)" \
-               READELF="$(TARGET_READELF)" \
-               STRIP="$(TARGET_STRIP)" \
-               OBJCOPY="$(TARGET_OBJCOPY)" \
-               OBJDUMP="$(TARGET_OBJDUMP)" \
-               AR_FOR_BUILD="$(HOSTAR)" \
-               AS_FOR_BUILD="$(HOSTAS)" \
-               CC_FOR_BUILD="$(HOSTCC)" \
-               GCC_FOR_BUILD="$(HOSTCC)" \
-               CXX_FOR_BUILD="$(HOSTCXX)" \
-               FC_FOR_BUILD="$(HOSTFC)" \
-               LD_FOR_BUILD="$(HOSTLD)" \
-               CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
-               CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-               CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
-               LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
-               FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
-               DEFAULT_ASSEMBLER="$(TARGET_AS)" \
-               DEFAULT_LINKER="$(TARGET_LD)" \
-               CPPFLAGS="$(TARGET_CPPFLAGS)" \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CXXFLAGS="$(TARGET_CXXFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               FCFLAGS="$(TARGET_FCFLAGS)" \
-               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-               STAGING_DIR="$(STAGING_DIR)" \
-               INTLTOOL_PERL=$(PERL)
+export PERL5LIB=$(HOST_DIR)/lib/perl
 
 TARGET_MAKE_ENV = PATH=$(BR_PATH)
 
-
-HOST_CONFIGURE_OPTS = PATH=$(BR_PATH) \
-               AR="$(HOSTAR)" \
-               AS="$(HOSTAS)" \
-               LD="$(HOSTLD)" \
-               NM="$(HOSTNM)" \
-               CC="$(HOSTCC)" \
-               GCC="$(HOSTCC)" \
-               CXX="$(HOSTCXX)" \
-               CPP="$(HOSTCPP)" \
-               OBJCOPY="$(HOSTOBJCOPY)" \
-               RANLIB="$(HOSTRANLIB)" \
-               CPPFLAGS="$(HOST_CPPFLAGS)" \
-               CFLAGS="$(HOST_CFLAGS)" \
-               CXXFLAGS="$(HOST_CXXFLAGS)" \
-               LDFLAGS="$(HOST_LDFLAGS)" \
-               PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
-               PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-               PKG_CONFIG_SYSROOT_DIR="/" \
-               PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
-               LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
-               INTLTOOL_PERL=$(PERL)
-
-HOST_MAKE_ENV = PATH=$(BR_PATH) \
-               LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib$(if $(LD_LIBRARY_PATH),:$(LD_LIBRARY_PATH))" \
-               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-               PKG_CONFIG_SYSROOT_DIR="/" \
-               PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+TARGET_CONFIGURE_OPTS = \
+       $(TARGET_MAKE_ENV) \
+       AR="$(TARGET_AR)" \
+       AS="$(TARGET_AS)" \
+       LD="$(TARGET_LD)" \
+       NM="$(TARGET_NM)" \
+       CC="$(TARGET_CC)" \
+       GCC="$(TARGET_CC)" \
+       CPP="$(TARGET_CPP)" \
+       CXX="$(TARGET_CXX)" \
+       FC="$(TARGET_FC)" \
+       F77="$(TARGET_FC)" \
+       RANLIB="$(TARGET_RANLIB)" \
+       READELF="$(TARGET_READELF)" \
+       STRIP="$(TARGET_STRIP)" \
+       OBJCOPY="$(TARGET_OBJCOPY)" \
+       OBJDUMP="$(TARGET_OBJDUMP)" \
+       AR_FOR_BUILD="$(HOSTAR)" \
+       AS_FOR_BUILD="$(HOSTAS)" \
+       CC_FOR_BUILD="$(HOSTCC)" \
+       GCC_FOR_BUILD="$(HOSTCC)" \
+       CXX_FOR_BUILD="$(HOSTCXX)" \
+       LD_FOR_BUILD="$(HOSTLD)" \
+       CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \
+       CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+       CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
+       LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
+       FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
+       DEFAULT_ASSEMBLER="$(TARGET_AS)" \
+       DEFAULT_LINKER="$(TARGET_LD)" \
+       CPPFLAGS="$(TARGET_CPPFLAGS)" \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       CXXFLAGS="$(TARGET_CXXFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS)" \
+       FCFLAGS="$(TARGET_FCFLAGS)" \
+       FFLAGS="$(TARGET_FCFLAGS)" \
+       PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+       STAGING_DIR="$(STAGING_DIR)" \
+       INTLTOOL_PERL=$(PERL)
+
+
+HOST_MAKE_ENV = \
+       PATH=$(BR_PATH) \
+       PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+       PKG_CONFIG_SYSROOT_DIR="/" \
+       PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+       PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+       PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
+
+HOST_CONFIGURE_OPTS = \
+       $(HOST_MAKE_ENV) \
+       AR="$(HOSTAR)" \
+       AS="$(HOSTAS)" \
+       LD="$(HOSTLD)" \
+       NM="$(HOSTNM)" \
+       CC="$(HOSTCC)" \
+       GCC="$(HOSTCC)" \
+       CXX="$(HOSTCXX)" \
+       CPP="$(HOSTCPP)" \
+       OBJCOPY="$(HOSTOBJCOPY)" \
+       RANLIB="$(HOSTRANLIB)" \
+       CPPFLAGS="$(HOST_CPPFLAGS)" \
+       CFLAGS="$(HOST_CFLAGS)" \
+       CXXFLAGS="$(HOST_CXXFLAGS)" \
+       LDFLAGS="$(HOST_LDFLAGS)" \
+       INTLTOOL_PERL=$(PERL)
 
 # This is extra environment we can not export ourselves (eg. because some
 # packages use that variable internally, eg. uboot), so we have to
@@ -323,7 +339,8 @@ HOST_MAKE_ENV = PATH=$(BR_PATH) \
 EXTRA_ENV = \
        PATH=$(BR_PATH) \
        BR2_DL_DIR=$(BR2_DL_DIR) \
-       BUILD_DIR=$(BUILD_DIR)
+       BUILD_DIR=$(BUILD_DIR) \
+       O=$(CANONICAL_O)
 
 ################################################################################
 # settings we need to pass to configure
@@ -349,6 +366,20 @@ else
 BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=no
 endif
 
+# AM_GNU_GETTEXT misdetects musl gettext support.
+# musl currently implements api level 1 and 2 (basic + ngettext)
+# http://www.openwall.com/lists/musl/2015/04/16/3
+#
+# These autoconf variables should only be pre-seeded when the minimal
+# gettext implementation of musl is used. When the full blown
+# implementation provided by gettext libintl is used, auto-detection
+# works fine, and pre-seeding those values is actually wrong.
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y:)
+BR2_GT_CV_FUNC_GNUGETTEXT_LIBC = \
+       gt_cv_func_gnugettext1_libc=yes \
+       gt_cv_func_gnugettext2_libc=yes
+endif
+
 TARGET_CONFIGURE_ARGS = \
        $(BR2_AC_CV_TRAP_CHECK) \
        ac_cv_func_mmap_fixed_mapped=yes \
@@ -359,40 +390,39 @@ TARGET_CONFIGURE_ARGS = \
        ac_cv_func_calloc_0_nonnull=yes \
        ac_cv_func_realloc_0_nonnull=yes \
        lt_cv_sys_lib_search_path_spec="" \
-       $(BR2_AC_CV_C_BIGENDIAN)
+       $(BR2_AC_CV_C_BIGENDIAN) \
+       $(BR2_GT_CV_FUNC_GNUGETTEXT_LIBC)
 
 ################################################################################
 
-ifeq ($(BR2_ENABLE_LOCALE),y)
-DISABLE_NLS :=
-else
-DISABLE_NLS :=--disable-nls
-endif
-
-ifneq ($(BR2_LARGEFILE),y)
-DISABLE_LARGEFILE = --disable-largefile
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+NLS_OPTS = --enable-nls
+TARGET_NLS_DEPENDENCIES = host-gettext
+ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
+TARGET_NLS_DEPENDENCIES += gettext
+TARGET_NLS_LIBS += -lintl
 endif
-
-ifeq ($(BR2_INET_IPV6),y)
-DISABLE_IPV6 = --enable-ipv6
 else
-DISABLE_IPV6 = --disable-ipv6
+NLS_OPTS = --disable-nls
 endif
 
+# We need anything that is invalid. Traditionally, we'd have used 'false' (and
+# we did so in the past). However, that breaks libtool for packages that have
+# optional C++ support (e.g. gnutls), because libtool will *require* a *valid*
+# C++ preprocessor as long as CXX is not 'no'.
+# Now, whether we use 'no' or 'false' for CXX as the same side effect: it is an
+# invalid C++ compiler, and thus will cause detection of C++ to fail (which is
+# expected and what we want), while at the same time taming libtool into
+# silence.
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-TARGET_CONFIGURE_OPTS += CXX=false
-endif
-
-ifeq ($(BR2_ENABLE_DEBUG),y)
-ENABLE_DEBUG := --enable-debug
-else
-ENABLE_DEBUG := --disable-debug
+TARGET_CONFIGURE_OPTS += CXX=no
 endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
 SHARED_STATIC_LIBS_OPTS = --enable-static --disable-shared
 TARGET_CFLAGS += -static
 TARGET_CXXFLAGS += -static
+TARGET_FCFLAGS += -static
 TARGET_LDFLAGS += -static
 else ifeq ($(BR2_SHARED_LIBS),y)
 SHARED_STATIC_LIBS_OPTS = --disable-static --enable-shared
@@ -413,3 +443,7 @@ include package/pkg-python.mk
 include package/pkg-virtual.mk
 include package/pkg-generic.mk
 include package/pkg-kconfig.mk
+include package/pkg-rebar.mk
+include package/pkg-kernel-module.mk
+include package/pkg-waf.mk
+include package/pkg-golang.mk