Changeset 557

Timestamp:

Sep 28, 2006, 5:56:25 PM (19 years ago)

Author:

bird

Message:

Initial Mac OS X / Darwin bootstrapping.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Config.kmk (modified) (3 diffs)
• kBuild/bin/x86.darwin (added)
• kBuild/bin/x86.darwin/kDepIDB (added)
• kBuild/bin/x86.darwin/kDepPre (added)
• kBuild/bin/x86.darwin/kmk (added)
• kBuild/bin/x86.darwin/kmk_append (added)
• kBuild/bin/x86.darwin/kmk_ash (added)
• kBuild/bin/x86.darwin/kmk_cat (added)
• kBuild/bin/x86.darwin/kmk_cp (added)
• kBuild/bin/x86.darwin/kmk_echo (added)
• kBuild/bin/x86.darwin/kmk_gmake (added)
• kBuild/bin/x86.darwin/kmk_install (added)
• kBuild/bin/x86.darwin/kmk_ln (added)
• kBuild/bin/x86.darwin/kmk_mkdir (added)
• kBuild/bin/x86.darwin/kmk_mv (added)
• kBuild/bin/x86.darwin/kmk_rm (added)
• kBuild/bin/x86.darwin/kmk_sed (added)
• kBuild/env.sh (modified) (2 diffs)
• kBuild/header.kmk (modified) (4 diffs)
• kBuild/tools/GCC3.kmk (modified) (1 diff)
• kBuild/tools/GCC4MACH.kmk (added)
• src/gmake/Makefile.kmk (modified) (7 diffs)
• src/gmake/config.h.darwin (added)
• src/gmake/kmkbuiltin/cp.c (modified) (1 diff)
• src/gmake/kmkbuiltin/darwin.c (added)
• src/gmake/kmkbuiltin/install.c (modified) (1 diff)
• src/gmake/kmkbuiltin/ln.c (modified) (1 diff)
• src/gmake/kmkbuiltin/mkdir.c (modified) (1 diff)
• src/gmake/kmkbuiltin/rm.c (modified) (2 diffs)

trunk/ChangeLog

@@ -1 +1 @@
 /* $Id$ */
+
+2006-09-28:
+    - kBuild/header.kmk, kBuild/env.sh, kBuild/tools/GCC4MACH.kmk, kBuild/bin/x86.darwin/, src/gmake, Config.kmk:
+        o Initial Mac OS X / Darwin bootstrapping.
 
 2006-09-23:

trunk/Config.kmk

@@ -4 +4 @@
 # Build Configuration.
 #
-# Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
+# Copyright (c) 2005-2006 knut st. osmundsen <bird@anduin.net>
 #
 #
@@ -41 +41 @@
 TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024
 TEMPLATE_BIN_INST               = kBuild/bin/x86.os2/
+endif
+
+ifeq ($(BUILD_TARGET),darwin)
+TEMPLATE_BIN_TOOL               = GCC4MACH
+TEMPLATE_BIN_CFLAGS.profile     =
+TEMPLATE_BIN_CFLAGS.release     = -O3
+TEMPLATE_BIN_LDFLAGS            = 
+TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET_ARCH).$(BUILD_TARGET)/
 endif
 
@@ -93 +101 @@
 #
 TEMPLATE_LIB = Library for Commandline binary
+TEMPLATE_LIB_EXTENDS = BIN
+TEMPLATE_LIB_INST    = lib/
+# for LIB_KDEP
+TEMPLATE_LIB_TOOL    = $(TEMPLATE_BIN_TOOL)
 
-TEMPLATE_LIB_TOOL                   = $(TEMPLATE_BIN_TOOL)
-TEMPLATE_LIB_INST                   = lib/
-TEMPLATE_LIB_INCS                   = $(TEMPLATE_BIN_INCS)
-TEMPLATE_LIB_INCS.$(BUILD_TYPE)     = $(TEMPLATE_BIN_INCS.$(BUILD_TYPE))
-TEMPLATE_LIB_DEFS                   = $(TEMPLATE_BIN_DEFS)
-TEMPLATE_LIB_DEFS.$(BUILD_TYPE)     = $(TEMPLATE_BIN_DEFS.$(BUILD_TYPE))
-TEMPLATE_LIB_CFLAGS                 = $(TEMPLATE_BIN_CFLAGS)
-TEMPLATE_LIB_CFLAGS.$(BUILD_TYPE)   = $(TEMPLATE_BIN_CFLAGS.$(BUILD_TYPE))
-TEMPLATE_LIB_CXXFLAGS               = $(TEMPLATE_BIN_CXXFLAGS)
-TEMPLATE_LIB_CXXFLAGS.$(BUILD_TYPE) = $(TEMPLATE_BIN_CXXFLAGS.$(BUILD_TYPE))
 
 LIB_KDEP = $(PATH_OUT)/$(TEMPLATE_LIB_INST)$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kDep$$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)

trunk/kBuild/env.sh

@@ -29 +29 @@
 # kBuild path.
 if [ -z "$PATH_KBUILD" ]; then
-    if which realpath > /dev/null 2>&1; then
-        PATH_KBUILD=`realpath $0`
-    else
-        PATH_KBUILD=`readlink -f $0`
-    fi
-    PATH_KBUILD=`dirname "$PATH_KBUILD"`
+    PATH_KBUILD=`dirname "$0"`
+    PATH_KBUILD=`cd "$PATH_KBUILD" ; /bin/pwd`
 fi
 if [ ! -f "$PATH_KBUILD/footer.kmk" -o ! -f "$PATH_KBUILD/header.kmk" -o ! -f "$PATH_KBUILD/rules.kmk" ]; then
@@ -104 +100 @@
         netbsd|NetBSD|NETBSD)
             BUILD_PLATFORM=netbsd
+            ;;
+
+        Darwin|darwin)
+            BUILD_PLATFORM=darwin
             ;;
 

trunk/kBuild/header.kmk

@@ -104 +104 @@
 else
  BUILD_PLATFORM     := $(strip $(BUILD_PLATFORM))
- ifneq ($(words $(BUILD_PLATFORM))$(filter-out freebsd l4 linux nt os2 win win32 win64,$(BUILD_PLATFORM)),1)
+ ifneq ($(words $(BUILD_PLATFORM))$(filter-out darwin freebsd l4 linux nt os2 win win32 win64,$(BUILD_PLATFORM)),1)
   # OS/2 (have uppercase legacy)
   ifeq ($(BUILD_PLATFORM),OS2)
@@ -138 +138 @@
 else
  BUILD_TARGET       := $(strip $(BUILD_TARGET))
- ifneq ($(words $(BUILD_TARGET))$(filter-out freebsd l4 linux nt os2 win win32 win64,$(BUILD_TARGET)),1)
+ ifneq ($(words $(BUILD_TARGET))$(filter-out darwin freebsd l4 linux nt os2 win win32 win64,$(BUILD_TARGET)),1)
   # OS/2 (have uppercase legacy)
   ifeq ($(BUILD_TARGET),OS2)
@@ -248 +248 @@
 HOSTSUFF_EXE        :=
 endif
+
+# Darwin / Mac OS X
+ifeq ($(BUILD_PLATFORM),darwin)
+EXEC_X86_WIN32      := false
+HOSTSUFF_EXE        :=
+endif
+
 
 PATH_TOOLS          := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
@@ -285 +292 @@
 SUFF_RES            :=
 endif
+ifeq ($(BUILD_TARGET),darwin)
+SUFF_OBJ            := .o
+SUFF_LIB            := .a
+SUFF_DLL            := .dylib
+SUFF_EXE            :=
+SUFF_SYS            := .a
+SUFF_RES            :=
+endif
 ifndef SUFF_OBJ
 SUFF_OBJ            := .o

trunk/kBuild/tools/GCC3.kmk

@@ -74 +74 @@
 ifeq ($(BUILD_TARGET),os2)
 TOOL_GCC3_LD_MAP              = -Zmap=$(1)
+TOOL_GCC3_LD_SYSMOD_MAP       = -Zmap=$(1)
 else
 TOOL_GCC3_LD_MAP              = -Wl,-Map -Wl,$(1) -Wl,--cref
-endif
-ifeq ($(BUILD_TARGET),os2)
-TOOL_GCC3_LD_SYSMOD_MAP       = -Zmap=$(1)
-else
 TOOL_GCC3_LD_SYSMOD_MAP       = -Map $(1) --cref
 endif

trunk/src/gmake/Makefile.kmk

@@ -10 +10 @@
 kmk_DEPS = $(PATH_TARGET)/config.h
 kmk_INCS = $(PATH_TARGET) .
+kmk_INCS.darwin = glob
+kmk_INCS.freebsd = glob
 #ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
 #kmk_INCS += kmkbuiltin/w32
@@ -76 +78 @@
         glob/fnmatch.c
 
+kmk_SOURCES.darwin = \
+        glob/glob.c \
+        glob/fnmatch.c
+
 #
 # kmkbuiltin commands
@@ -102 +108 @@
 endif
 
+kmk_SOURCES.darwin += \
+        kmkbuiltin/darwin.c
+
+
 #
 # Standalone kmkbuiltin commands.
@@ -131 +141 @@
         getopt1.c
 endif
+kmk_cp_SOURCES.darwin = \
+        kmkbuiltin/darwin.c
 
 kmk_echo_TEMPLATE = BIN
@@ -203 +215 @@
 
 
+
 #
 # kmk_gmake - almost plain GNU Make.
@@ -210 +223 @@
 kmk_gmake_DEPS = $(PATH_TARGET)/config.h
 kmk_gmake_INCS = $(PATH_TARGET) .
+kmk_gmake_INCS.darwin = glob
+kmk_gmake_INCS.freebsd = glob
+
 
 kmk_gmake_DEFS = \
@@ -258 +274 @@
         glob/fnmatch.c
 
+kmk_gmake_SOURCES.darwin = \
+        glob/glob.c \
+        glob/fnmatch.c
+
 
 

trunk/src/gmake/kmkbuiltin/cp.c

@@ -142 +142 @@
         optarg = NULL;
         optopt = 0;
-#if defined(__FreeBSD__) || defined(__EMX__)
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
         optreset = 1;
         optind = 1;

trunk/src/gmake/kmkbuiltin/install.c

@@ -153 +153 @@
         optarg = NULL;
         optopt = 0;
-#if defined(__FreeBSD__) || defined(__EMX__)
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
         optreset = 1;
         optind = 1;

trunk/src/gmake/kmkbuiltin/ln.c

@@ -89 +89 @@
         optarg = NULL;
         optopt = 0;
-#if defined(__FreeBSD__) || defined(__EMX__)
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
         optreset = 1;
         optind = 1;

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -86 +86 @@
         optarg = NULL;
         optopt = 0;
-#if defined(__FreeBSD__) || defined(__EMX__)
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
         optreset = 1;
         optind = 1;

trunk/src/gmake/kmkbuiltin/rm.c

@@ -81 +81 @@
 #endif
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 extern void strmode(mode_t mode, char *p);
 #endif
@@ -122 +122 @@
         optarg = NULL;
         optopt = 0;
-#if defined(__FreeBSD__) || defined(__EMX__)
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
         optreset = 1;
         optind = 1;