From bc4105bc807f3159ca77811a10abde2f2784176f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Dec 2009 16:10:41 +0100
Subject: fix some minor issues on OpenBSD host

---
 Makefile    | 4 ++--
 TODO        | 1 -
 mk/build.mk | 1 +
 rules.mk    | 2 +-
 scripts/awk | 9 +++++++++
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100755 scripts/awk

diff --git a/Makefile b/Makefile
index 8c66e020e..74127e74a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-_UNLIMIT=	ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null;
+_UNLIMIT=	ulimit -dS $(shell ulimit -dH >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null;
 
 all: .prereq_done
 	@${_UNLIMIT} ${GMAKE_INV} all
@@ -187,7 +187,7 @@ NO_ERROR=0
 	    -e 's/i[3-9]86/i386/' \
 	    )" >>prereq.mk
 	@echo 'HOSTCC:=${CC}' >>prereq.mk
-	@echo 'HOSTCFLAGS:=-O2 -fwrapv' >>prereq.mk
+	@echo 'HOSTCFLAGS:=-O2' >>prereq.mk
 	@echo 'LANGUAGE:=C' >>prereq.mk
 	@echo 'LC_ALL:=C' >>prereq.mk
 	@echo 'MAKE:=$${GMAKE}' >>prereq.mk
diff --git a/TODO b/TODO
index 364a66212..61921cbe3 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 - netbsd build
 - macos x build
-- openbsd build
 - make rpm package backend working
 - network scripts for wireless client / ap
 - network scripts for pppoe
diff --git a/mk/build.mk b/mk/build.mk
index 6397d78bb..856565345 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -13,6 +13,7 @@ CONFIG = config
 DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 			ADK_DEBUG=n \
 			ADK_STATIC=n \
+			ADK_MAKE_PARALLEL=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
diff --git a/rules.mk b/rules.mk
index 53496e223..145ca7a62 100644
--- a/rules.mk
+++ b/rules.mk
@@ -40,7 +40,7 @@ export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH
 
 HOSTCPPFLAGS?=
 HOSTLDFLAGS?=
-TARGET_CFLAGS:=		$(strip -fwrapv -fno-ident ${TARGET_CFLAGS})
+TARGET_CFLAGS:=		$(strip -fno-ident ${TARGET_CFLAGS})
 TARGET_CC:=		$(strip ${TARGET_CC})
 TARGET_CXX:=		$(strip ${TARGET_CXX})
 
diff --git a/scripts/awk b/scripts/awk
new file mode 100755
index 000000000..ff6f9b002
--- /dev/null
+++ b/scripts/awk
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gawk 2>/dev/null)" ];then
+	/bin/awk "$@"
+else
+	gawk "$@"
+fi
-- 
cgit v1.2.3