Browse Source

fix some minor issues on OpenBSD host

Waldemar Brodkorb 14 years ago
parent
commit
bc4105bc80
5 changed files with 13 additions and 4 deletions
  1. 2 2
      Makefile
  2. 0 1
      TODO
  3. 1 0
      mk/build.mk
  4. 1 1
      rules.mk
  5. 9 0
      scripts/awk

+ 2 - 2
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

+ 0 - 1
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

+ 1 - 0
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 \

+ 1 - 1
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})
 

+ 9 - 0
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