Commit 1f020bb4 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- store uClibc's configfile as BR2_UCLIBC_CONFIG in menuconfig

parent beca59b0

toolchain/uClibc/Config.in

+17 −0
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ choice 
		bool "uClibc 0.9.28"



	config BR2_UCLIBC_VERSION_0_9_28_3

		depends BR2_DEPRECATED

		bool "uClibc 0.9.28.3"



	config BR2_UCLIBC_VERSION_0_9_29

		bool "uClibc 0.9.29"



	config BR2_UCLIBC_VERSION_SNAPSHOT

		bool "daily snapshot"
@@ -29,6 +33,19 @@ config BR2_USE_UCLIBC_SNAPSHOT 
	help

	    Use latest snapshot or one from a specific date?



config BR2_UCLIBC_CONFIG

	string "uClibc configuration file to use?"

	default "toolchain/uClibc/uClibc-0.9.28.config" if BR2_UCLIBC_VERSION_0_9_28

	default "toolchain/uClibc/uClibc-0.9.28.config" if BR2_UCLIBC_VERSION_0_9_28_3

	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29

	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_30

	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_SNAPSHOT

	help

	  Some people may wish to use their own modified uClibc configuration

	  file and will specify their config file location with this option.

	  See also docs/README in this package.

	  If unsure, use the default.



config BR2_ENABLE_LOCALE

	bool "Enable locale/gettext/i18n support?"

	default n

toolchain/uClibc/uclibc.mk

+12 −6
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ 


ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)



# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config

# setting.

ifndef UCLIBC_CONFIG_FILE

UCLIBC_CONFIG_FILE=$(subst ",, $(strip $(BR2_UCLIBC_CONFIG)))

#")

endif



ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)

# Be aware that this changes daily....

UCLIBC_VER:=0.9.29
@@ -13,22 +20,21 @@ UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc 
UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2

#"))

UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots

ifndef UCLIBC_CONFIG_FILE

UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc-0.9.29.config

endif

else

# releases

ifeq ($(BR2_UCLIBC_VERSION_0_9_29),y)

UCLIBC_VER:=0.9.29

endif

ifeq ($(BR2_UCLIBC_VERSION_0_9_28_3),y)

UCLIBC_VER:=0.9.28.3

endif

ifeq ($(BR2_UCLIBC_VERSION_0_9_28),y)

UCLIBC_VER:=0.9.28

endif



UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER)

UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2

UCLIBC_SITE:=http://www.uclibc.org/downloads

ifndef UCLIBC_CONFIG_FILE

UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc-0.9.28.config

endif

endif



UCLIBC_CAT:=$(BZCAT)