diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:19:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:20:13 +0100 |
| commit | 739d512289d14ade82e9fbae7f4371e65989622f (patch) | |
| tree | 66c17c7e39a041169e08ea7137f072e3b65ab945 /mk | |
| parent | d47894abb5304cf3bb30b3669e596d648b5277ba (diff) | |
add three library methods, static, shared or both
Rename the static symbol and add the choice to a more
visible place for users.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 8 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 9ab3c83d6..f089a35c2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -39,7 +39,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_TARGET_USE_GOLD=n \ ADK_TARGET_USE_GNU_HASHSTYLE=n \ ADK_TARGET_USE_PIE=n \ - ADK_TARGET_USE_STATIC_LIBS=n \ + ADK_TARGET_USE_STATIC_LIBS_ONLY=n \ ADK_TARGET_USE_LD_RELRO=n \ ADK_TARGET_USE_LD_BIND_NOW=n \ ADK_TARGET_USE_LD_GC=n \ diff --git a/mk/package.mk b/mk/package.mk index 40a791616..21299455d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -113,7 +113,7 @@ IDIR_$(1)_DEV= $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(2)-dev IDIR_$(1)_DBG= $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(2)-dbg ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ifneq (,$(filter dev,$(7))) -ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ifneq ($(ADK_TARGET_BINFMT_FLAT),y) ALL_IPKGS+= $$(IPKG_$(1)) ALL_IDIRS+= $${IDIR_$(1)} diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 7602b4674..b501d5a28 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -13,9 +13,13 @@ PKG_LIBNAME?= $(PKG_NAME) -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_SHARED_LIBS_ONLY),y) +CONFIGURE_LIB:=--disable-static --enable-shared +endif +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_LIB:=--enable-static --disable-shared -else +endif +ifeq ($(ADK_TARGET_USE_SHARED_AND_STATIC_LIBS),y) CONFIGURE_LIB:=--enable-static --enable-shared endif diff --git a/mk/vars.mk b/mk/vars.mk index eb0336cf2..38e65b80d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -201,7 +201,7 @@ TARGET_LDFLAGS+= -Wl,--secure-plt endif endif -ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) TARGET_CFLAGS+= -static TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static |