Commit 66f48146 authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Peter Korsgaard
Browse files

uclibc: explicitly set HAVE_SHARED depending on BR2_PREFER_STATIC_LIB 



Now with change of BR2_PREFER_STATIC_LIB meaning to "do not build dynamic libs
and build statically linked applications" it's possible to disable support of
shared libs in uClibc as well as builting of shared libc libs.

Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7d9c0df0

package/uclibc/uClibc-0.9.31.config

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ HAVE_DOT_CONFIG=y 
DOPIC=y

# ARCH_HAS_NO_SHARED is not set

# ARCH_HAS_NO_LDSO is not set

HAVE_SHARED=y

# FORCE_SHAREABLE_TEXT_SEGMENTS is not set

LDSO_LDD_SUPPORT=y

# LDSO_CACHE_SUPPORT is not set

package/uclibc/uClibc-0.9.33.config

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ HAVE_DOT_CONFIG=y 
DOPIC=y

# ARCH_HAS_NO_SHARED is not set

# ARCH_HAS_NO_LDSO is not set

HAVE_SHARED=y

# FORCE_SHAREABLE_TEXT_SEGMENTS is not set

LDSO_LDD_SUPPORT=y

# LDSO_CACHE_SUPPORT is not set

package/uclibc/uClibc-snapshot.config

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ HAVE_DOT_CONFIG=y 
DOPIC=y

# ARCH_HAS_NO_SHARED is not set

# ARCH_HAS_NO_LDSO is not set

HAVE_SHARED=y

# FORCE_SHAREABLE_TEXT_SEGMENTS is not set

LDSO_LDD_SUPPORT=y

# LDSO_CACHE_SUPPORT is not set

package/uclibc/uclibc.mk

+11 −0
Original line number Diff line number Diff line
@@ -381,6 +381,16 @@ else 
UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config)

endif



#

# static/shared libs

#



ifeq ($(BR2_PREFER_STATIC_LIB),y)

UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config)

else

UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config)

endif



#

# Commands

#
@@ -420,6 +430,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS 
	$(UCLIBC_THREAD_DEBUG_CONFIG)

	$(UCLIBC_LOCALE_CONFIG)

	$(UCLIBC_WCHAR_CONFIG)

	$(UCLIBC_SHARED_LIBS_CONFIG)

endef



ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)