diff options
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/package.mk | 12 | ||||
-rw-r--r-- | mk/vars.mk | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index a5d5d1c57..929dfdee1 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -11,7 +11,6 @@ endif CONFIG_CONFIG_IN = Config.in CONFIG = adk/config DEFCONFIG= ADK_DEBUG=n \ - ADK_STATIC=n \ ADK_DISABLE_KERNEL_PATCHES=n \ ADK_DISABLE_TARGET_KERNEL_PATCHES=n \ ADK_WGET_TIMEOUT=180 \ @@ -48,6 +47,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_LINUX_ARM_WITH_THUMB=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ diff --git a/mk/package.mk b/mk/package.mk index 0025f802c..d468d6ed0 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -123,11 +123,20 @@ IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev IDIR_$(1)_DBG= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dbg ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) +ifneq (,$(filter dev,$(7))) +ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) +ALL_IPKGS+= $$(IPKG_$(1)) +ALL_IDIRS+= $${IDIR_$(1)} +ALL_POSTINST+= $(2)-install +$(2)-install: +endif +else ALL_IPKGS+= $$(IPKG_$(1)) ALL_IDIRS+= $${IDIR_$(1)} ALL_POSTINST+= $(2)-install $(2)-install: endif +endif INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list INFO_$(1)_DEV= $(PKG_STATE_DIR)/info/$(2)-dev.list INFO_$(1)_DBG= $(PKG_STATE_DIR)/info/$(2)-dbg.list @@ -264,7 +273,7 @@ ifeq (,$(filter noscripts,$(7))) >>'$${STAGING_PKG_DIR}/$(1)'; \ done endif -ifeq (,$(filter libmix,$(7))) + ifeq (,$(filter libonly,$(7))) ifeq (,$(filter devonly,$(7))) $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE) @@ -273,7 +282,6 @@ ifneq ($(ADK_DEBUG),y) endif endif endif -endif ifneq (,$(filter dev,$(7))) $${PKG_BUILD} $${IDIR_$(1)_DEV} $${PACKAGE_DIR} $(MAKE_TRACE) endif diff --git a/mk/vars.mk b/mk/vars.mk index f1bf2be48..bd77f391f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -97,7 +97,7 @@ TARGET_LDFLAGS+= -Wl,--secure-plt endif endif -ifeq ($(ADK_STATIC),y) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) TARGET_CFLAGS+= -static TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static |