summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk6
-rw-r--r--mk/package.mk3
-rw-r--r--mk/vars.mk10
3 files changed, 15 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk
index af1313206..6dcf88f1a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,6 +18,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_LEAVE_ETC_ALONE=n \
ADK_SIMPLE_NETWORK_CONFIG=n \
ADK_USE_CCACHE=n \
+ ADK_RUNTIME_START_SERVICES=n \
ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_E2FSCK_STATIC=n \
ADK_PACKAGE_KEXECINIT=n \
@@ -41,8 +42,9 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PKG_TEST=n \
ADK_PKG_MPDBOX=n \
ADK_PKG_DEVELOPMENT=n \
- ADK_TOOLCHAIN_GCC_USE_SSP=n \
- ADK_TOOLCHAIN_GCC_USE_LTO=n \
+ ADK_TOOLCHAIN_USE_SSP=n \
+ ADK_TOOLCHAIN_USE_LTO=n \
+ ADK_TOOLCHAIN_USE_GOLD=n \
BUSYBOX_IFPLUGD=n \
BUSYBOX_EXTRA_COMPAT=n \
BUSYBOX_FEATURE_IFCONFIG_SLIP=n \
diff --git a/mk/package.mk b/mk/package.mk
index eba9c446a..c23530e17 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -178,6 +178,9 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
done
+ifeq ($(ADK_RUNTIME_START_$(1)),y)
+ $(SED) "s#NO#YES#" $$(IDIR_$(1))/CONTROL/postinst
+endif
ifneq ($(ADK_DEBUG),y)
@echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control
@echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control
diff --git a/mk/vars.mk b/mk/vars.mk
index e804ad5e6..2f2ecc134 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -111,13 +111,19 @@ TARGET_LDFLAGS+= -Wl,--secure-plt
endif
endif
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+= -static
+TARGET_CXXFLAGS+= -static
+TARGET_LDFLAGS+= -static
+endif
+
+ifneq ($(ADK_TOOLCHAIN_USE_SSP),)
TARGET_CFLAGS+= -fstack-protector
TARGET_CXXFLAGS+= -fstack-protector
TARGET_LDFLAGS+= -fstack-protector
endif
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),)
+ifneq ($(ADK_TOOLCHAIN_USE_LTO),)
TARGET_CFLAGS+= -flto
TARGET_CXXFLAGS+= -flto
TARGET_LDFLAGS+= -flto