diff options
| -rw-r--r-- | package/uclibc/uClibc-0.9.31.config | 1 | ||||
| -rw-r--r-- | package/uclibc/uClibc-0.9.33.config | 1 | ||||
| -rw-r--r-- | package/uclibc/uClibc-snapshot.config | 1 | ||||
| -rw-r--r-- | package/uclibc/uclibc.mk | 11 |
4 files changed, 11 insertions, 3 deletions
diff --git a/package/uclibc/uClibc-0.9.31.config b/package/uclibc/uClibc-0.9.31.config index b23ba731ae..76772e850a 100644 --- a/package/uclibc/uClibc-0.9.31.config +++ b/package/uclibc/uClibc-0.9.31.config @@ -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 diff --git a/package/uclibc/uClibc-0.9.33.config b/package/uclibc/uClibc-0.9.33.config index 0fbce19b96..1b07d4a0a9 100644 --- a/package/uclibc/uClibc-0.9.33.config +++ b/package/uclibc/uClibc-0.9.33.config @@ -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 diff --git a/package/uclibc/uClibc-snapshot.config b/package/uclibc/uClibc-snapshot.config index dea767e4ae..ffc15358a4 100644 --- a/package/uclibc/uClibc-snapshot.config +++ b/package/uclibc/uClibc-snapshot.config @@ -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 diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d66da17dd5..b2ecce397b 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -382,6 +382,16 @@ 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) |
