From b1493d762cd757b376653eb65e78add28e3e94c6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 13:21:45 +0200
Subject: enable static globally

---
 mk/vars.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index e804ad5e6..49eb3e7e3 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -111,6 +111,12 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+TARGET_CXXFLAGS+=	-static
+TARGET_LDFLAGS+=	-static
+endif
+
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
-- 
cgit v1.2.3


From d63d9df8e5c245214fbd94856773eba4b0c731cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 14:37:00 +0200
Subject: add gold support

---
 mk/build.mk | 5 +++--
 mk/vars.mk  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index af1313206..2573027e7 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -41,8 +41,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/vars.mk b/mk/vars.mk
index 49eb3e7e3..2f2ecc134 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -117,13 +117,13 @@ TARGET_CXXFLAGS+=	-static
 TARGET_LDFLAGS+=	-static
 endif
 
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
+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
-- 
cgit v1.2.3


From f3cc98651b738ac7f2dc56ea772afa9f874b9d3b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 17:23:11 +0200
Subject: allow to enable daemons on startup via menuconfig

---
 mk/package.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mk')

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
-- 
cgit v1.2.3


From a3ec77a3841c77a8b322f83b5075c80438bc8a45 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 21:40:12 +0200
Subject: disable start services for bulk/release builds

---
 mk/build.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 2573027e7..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 \
-- 
cgit v1.2.3