From f0bd75d79c4b390ddd3fb4288065e58fb674497d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 11 Jun 2014 08:30:25 +0200
Subject: ignore config.sub/config.guess, do not create backup and restore it
 on update-patches, fix some minor issues. PIE can only be used for binaries
 and need support in a package

---
 mk/buildhlp.mk   | 10 ----------
 mk/modules.mk    |  8 ++++----
 mk/pkg-bottom.mk | 30 +++++++++---------------------
 mk/vars.mk       | 13 +++++--------
 4 files changed, 18 insertions(+), 43 deletions(-)

(limited to 'mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index f165d86a4..1322e7a85 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -98,16 +98,6 @@ endif
 		env ${AUTOTOOL_ENV} autoreconf -if > /dev/null 2>&1; \
 		rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE)
 	@# restore config.sub/config.guess
-	@for i in $$(find ${WRKDIR} -name config.sub);do \
-		if [ -f $$i.bak ];then \
-			mv $$i.bak $$i; \
-		fi;\
-	done
-	@for i in $$(find ${WRKDIR} -name config.guess);do \
-		if [ -f $$i.bak ];then \
-			mv $$i.bak $$i; \
-		fi;\
-	done
 	@WRKDIST=$(call shellescape,${WRKDIST}) \
 	    WRKDIR1=$(call shellescape,${WRKDIR}) \
 	    PATH=$(call shellescape,${HOST_PATH}) \
diff --git a/mk/modules.mk b/mk/modules.mk
index 893c5600b..406a3b004 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -757,9 +757,9 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\
     $(MODULES_DIR)/kernel/drivers/block/nbd \
 ,20))
 
-$(eval $(call KMOD_template,SCSI,scsi,\
-    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
-,20))
+#$(eval $(call KMOD_template,SCSI,scsi,\
+#    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
+#,20))
 
 $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\
     $(MODULES_DIR)/kernel/drivers/scsi/sd_mod \
@@ -1765,7 +1765,7 @@ $(eval $(call KMOD_template,PLIP,plip,\
 #
 
 $(eval $(call KMOD_template,OPROFILE,oprofile,\
-	$(MODULES_DIR)/kernel/arch/$(ARCH)/oprofile/oprofile \
+	$(MODULES_DIR)/kernel/arch/$(ADK_TARGET_ARCH)/oprofile/oprofile \
 ,10))
 
 #
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 26545a70a..f651e7315 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -33,43 +33,28 @@ ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
 endif
 	mkdir -p ${WRKBUILD}
 	@${MAKE} pre-configure $(MAKE_TRACE)
-
-ifneq ($(filter manual,${CONFIG_STYLE}),)
-	env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
-else ifneq ($(filter minimal,${CONFIG_STYLE}),)
-	@$(CMD_TRACE) "configuring... "
 	@cd ${WRKSRC}; \
 	    for i in $$(find . -name config.sub);do \
 		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
 			${CP} ${SCRIPT_DIR}/config.sub $$i; \
 		fi; \
 	    done; \
 	    for i in $$(find . -name config.guess);do \
 		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
 			${CP} ${SCRIPT_DIR}/config.guess $$i; \
 		fi; \
 	    done;
+
+ifneq ($(filter manual,${CONFIG_STYLE}),)
+	env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
+else ifneq ($(filter minimal,${CONFIG_STYLE}),)
+	@$(CMD_TRACE) "configuring... "
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
 else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
-	@cd ${WRKSRC}; \
-	    for i in $$(find . -name config.sub);do \
-		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
-			${CP} ${SCRIPT_DIR}/config.sub $$i; \
-		fi; \
-	    done; \
-	    for i in $$(find . -name config.guess);do \
-		if [ -f $$i ]; then \
-			${CP} $$i $$i.bak; \
-			${CP} ${SCRIPT_DIR}/config.guess $$i; \
-		fi; \
-	    done;
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \
@@ -266,5 +251,8 @@ endif
 
 ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
 DIFF_IGNOREFILES?=	configure missing depcomp install-sh INSTALL \
-			aclocal.m4 config.h.in Makefile.in */Makefile.in
+			aclocal.m4 config.h.in Makefile.in */Makefile.in \
+			config.sub config.guess */config.sub */config.guess
+else
+DIFF_IGNOREFILES?=	config.sub config.guess */config.sub */config.guess
 endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 2074d6c52..46a95c533 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -115,11 +115,6 @@ TARGET_CXXFLAGS+=	-fstack-protector-all --param=ssp-buffer-size=4
 TARGET_LDFLAGS+=	-fstack-protector-all
 endif
 
-ifneq ($(ADK_TARGET_USE_PIE),)
-TARGET_CFLAGS+=		-fPIE
-TARGET_CXXFLAGS+=	-fPIE
-endif
-
 ifneq ($(ADK_TARGET_USE_LD_GC),)
 TARGET_CFLAGS+=		-fdata-sections -ffunction-sections
 TARGET_CXXFLAGS+=	-fdata-sections -ffunction-sections
@@ -177,12 +172,14 @@ PATCH=			PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh
 PATCHP0=		PATH=${HOST_PATH} patch -p0
 SED:=			PATH=${HOST_PATH} sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} \
+KERNEL_MODULE_FLAGS:=	ARCH=${ADK_TARGET_ARCH} \
+			PREFIX=/usr \
 			KERNEL_PATH=${LINUX_DIR} \
 			KERNELDIR=${LINUX_DIR} \
 			KERNEL_DIR=${LINUX_DIR} \
-			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
-			CFLAGS_MODULE="-fhonour-copts" V=1
+			CROSS_COMPILE="${TARGET_CROSS}" \
+			CFLAGS_MODULE="-fhonour-copts" \
+			V=1
 
 TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			AR='$(TARGET_CROSS)ar' \
-- 
cgit v1.2.3