gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util-linux: fix build with locale in toolchain

Browse Source 
Closes #529.

util-linux needs to link with libintl when locale support is available /
requested in the toolchain, similar to how it is done for avahi.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2009-08-30 22:01:23 +02:00
parent 621e8726f9
commit 014df317d4
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -1,3 +1,9 @@
2009.08, Not yet released:
Issues resolved (http://bugs.uclibc.org):
#529: util-linux doesn't find headers and include libs correctly
2009.08-rc3, Released August 26th, 2009:
Additional fixes and cleanups.

2
package/util-linux/Config.in
View File

@ -1,5 +1,7 @@
config BR2_PACKAGE_UTIL-LINUX
bool "util-linux"
select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
help
Various useful/essential Linux utilities.

11
package/util-linux/util-linux.mk
View File

@ -18,6 +18,11 @@ else
UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
endif
ifeq ($(BR2_PACKAGE_LIBINTL),y)
UTIL-LINUX_DEPENDENCIES += libintl
UTIL-LINUX_MAKE_OPT = LIBS=-lintl
endif
$(DL_DIR)/$(UTIL-LINUX_SOURCE):
$(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE))
@ -56,6 +61,7 @@ $(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured
ARCH=$(ARCH) \
CC=$(TARGET_CC) \
OPT="$(TARGET_CFLAGS)" \
$(UTIL-LINUX_MAKE_OPT) \
HAVE_SLANG="NO"
$(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
@ -66,11 +72,10 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
#If both util-linux and busybox are selected, make certain util-linux
#wins the fight over who gets to have their utils actually installed
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
util-linux: uclibc busybox $(UTIL-LINUX_TARGET_BINARY)
else
util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY)
UTIL-LINUX_DEPENDENCIES = busybox $(UTIL-LINUX_DEPENDENCIES)
endif
util-linux: uclibc $(UTIL-LINUX_DEPENDENCIES) $(UTIL-LINUX_TARGET_BINARY)
util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)