Changeset 2421

Timestamp:

Oct 17, 2010, 11:27:53 PM (15 years ago)

Author:

bird

Message:

OpenBSD hacks.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• bootstrap.gmk (modified) (1 diff)
• src/kmk/Makefile.kmk (modified) (4 diffs)
• src/kmk/kmkbuiltin/chmod.c (modified) (1 diff)
• src/kmk/kmkbuiltin/mv.c (modified) (1 diff)
• src/kmk/kmkbuiltin/openbsd.c (copied) (copied from trunk/src/kmk/kmkbuiltin/darwin.c ) (1 diff)
• src/kmk/kmkbuiltin/osdep.c (modified) (1 diff)
• src/kmk/maintMakefile (modified) (1 diff)

trunk/Config.kmk

@@ -96 +96 @@
 PATH_GNUMAKE_SRC ?= $(PATH_ROOT)/src/kmk
 
+
+#
+# Various platform specific hacks.
+#
+ifn1of ($(KBUILD_TARGET), openbsd)
+ GCC_Wextra = -Wextra
+endif
+if1of ($(KBUILD_TARGET), openbsd)
+ TOOL_FLEX_LEX = gflex
+endif
 
 #
@@ -179 +189 @@
 # Template for building commandline tools.
 #
-TEMPLATE_BIN = Commandline binary
+TEMPLATE_BIN = Command line binary
 
 TEMPLATE_BIN_INCS               = $(PATH_ROOT)/src/lib
@@ -224 +234 @@
  TEMPLATE_BIN_CFLAGS            = -g -mmacosx-version-min=10.$(KBUILD_MACOSX_TARGET_VERSION) -isysroot $(KBUILD_MACOSX_SDK)
  ifeq ($(USER),bird)
-  TEMPLATE_BIN_CFLAGS          += -Wall -Wextra -pedantic -Wno-unused-parameter
+  TEMPLATE_BIN_CFLAGS          += -Wall $(GCC_Wextra) -pedantic -Wno-unused-parameter
   TEMPLATE_BIN_DEFS            += NO_ENUM_BITFIELDS
  endif
@@ -285 +295 @@
  TEMPLATE_BIN_CFLAGS            = -g
  ifeq ($(USER),bird)
-  TEMPLATE_BIN_CFLAGS          += -Wall -Wextra -pedantic -Wno-unused-parameter
+  TEMPLATE_BIN_CFLAGS          += -Wall $(GCC_Wextra) -pedantic -Wno-unused-parameter
   TEMPLATE_BIN_DEFS            += NO_ENUM_BITFIELDS
  endif
@@ -317 +327 @@
 
 #
+# Template for building threaded binaries.
+#
+TEMPLATE_BIN-THREADED = Threaded command line binary
+TEMPLATE_BIN-THREADED_EXTENDS = BIN
+TEMPLATE_BIN-THREADED_EXTENDS_BY = appending
+if1of ($(KBUILD_TARGET), dragonfly freebsd openbsd)
+ TEMPLATE_BIN-THREADED_LIBS = pthread
+endif
+
+#
 # Template for building libraries for the tools.
 #

trunk/bootstrap.gmk

@@ -41 +41 @@
 # Note to self on bootstrapping solaris.sparc64:
 #   SED_MAKE_DEFS="SED=gsed" AUTOPOINT=true ACLOCAL=aclocal-1.10 AUTOMAKE=automake-1.10 nice ./kBuild/env.sh --full gmake -f bootstrap.gmk
+#
+# Note to self on bootstrapping openbsd:
+#   AUTOCONF_VERSION=2.59 AUTOMAKE_VERSION=1.9 ./kBuild/env.sh --full gmake -f bootstrap.gmk
 #
 

trunk/src/kmk/Makefile.kmk

@@ -32 +32 @@
 #
 TEMPLATE_BIN-KMK = Template for src/gmake binaries
-TEMPLATE_BIN-KMK_EXTENDS = BIN
+TEMPLATE_BIN-KMK_EXTENDS = BIN-THREADED
 TEMPLATE_BIN-KMK_DEFS = \
         HAVE_CONFIG_H \
@@ -52 +52 @@
         $(PATH_kmk)/pwd.h \
         $(PATH_kmk)/inttypes.h
-TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN_CFLAGS.win.amd64) -wd4244 -wd4267
+TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN-THREADED_CFLAGS.win.amd64) -wd4244 -wd4267
 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
-TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN_INCS)
+TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN-THREADED_INCS)
 TEMPLATE_BIN-KMK_INCS.darwin = glob
 TEMPLATE_BIN-KMK_INCS.dragonfly = glob
 TEMPLATE_BIN-KMK_INCS.freebsd = glob
+TEMPLATE_BIN-KMK_INCS.openbsd = glob
 TEMPLATE_BIN-KMK_INCS.solaris = glob
-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN_LIBS) $(TARGET_kmkmissing) $(LIB_KUTIL)
+TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(TARGET_kmkmissing) $(LIB_KUTIL)
 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
 else
- TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
+ TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
 endif
 endif
@@ -103 +104 @@
 kmkmissing_SOURCES.linux += \
         kmkbuiltin/strlcpy.c
+
+kmkmissing_SOURCES.openbsd = \
+        kmkbuiltin/openbsd.c \
+        glob/glob.c
 
 kmkmissing_SOURCES.solaris = \
@@ -216 +221 @@
         remote-stub.c
 
-kmk_LIBS.dragonfly = pthread
-
-kmk_LIBS.freebsd = pthread
 kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
 

trunk/src/kmk/kmkbuiltin/chmod.c

@@ -68 +68 @@
 extern void bsd_strmode(mode_t mode, char *p);
 
-#if defined(__APPLE__) && !defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)
+#if (defined(__APPLE__) && !defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) || defined(__OpenBSD__)
 extern int lchmod(const char *, mode_t);
 #endif

trunk/src/kmk/kmkbuiltin/mv.c

@@ -100 +100 @@
 extern void bsd_strmode(mode_t mode, char *p);
 
-#if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__)
+#if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
 # ifdef __OS2__
 static

trunk/src/kmk/kmkbuiltin/openbsd.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Missing BSD functions on Darwin / Mac OS X.
+ * Missing BSD functions in OpenBSD.
  */
 

trunk/src/kmk/kmkbuiltin/osdep.c

@@ -39 +39 @@
 # include "darwin.c"
 
+#elif defined(__OpenBSD__)
+# include "openbsd.c"
+
 #endif
 

trunk/src/kmk/maintMakefile

@@ -4 +4 @@
 
 # We like mondo-warnings!
+ifeq ($(KBUILD_TARGET),openbsd) # bird
+AM_CFLAGS += -Wall -Wshadow -Wpointer-arith -Wbad-function-cast
+else
 AM_CFLAGS += -Wall -Wextra -Wdeclaration-after-statement -Wshadow -Wpointer-arith -Wbad-function-cast
+endif
 
 # I want this one but I have to wait for the const cleanup!