Changeset 9133

Timestamp:

05/26/08 19:21:04 (6 months ago)

Author:

vboxsync

Message:

The proper way of building on leopard.

Files:

• trunk/Config.kmk (modified) (13 diffs)
• trunk/configure (modified) (6 diffs)
• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -728 +728 @@
-DEFS.x86     = RT_ARCH_X86 __X86__
-DEFS.amd64   = RT_ARCH_AMD64 __AMD64__
- MAC_OS_X_VERSION_MIN_REQUIRED=1040 MAC_OS_X_VERSION_MAX_ALLOWED=1040
+
-DEFS.darwin.x86 = VBOX_WITH_HYBIRD_32BIT_KERNEL
-DEFS.freebsd = RT_OS_FREEBSD __FREEBSD__
@@ -998 +998 @@
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -1539 +1548 @@
-ifeq ($(VBOX_LDR_FMT32),macho)
-TEMPLATE_VBOXGC_TOOL                = GXX4MACHO
-
-
-
+
+
+
+
-#TEMPLATE_VBOXGC_LDFLAGS.release     = -Wl,-S ???
-endif
@@ -1642 +1652 @@
-ifeq ($(VBOX_LDR_FMT),macho)
-TEMPLATE_VBOXR0_TOOL                = GXX4MACHO
-
-
-
+
+
+
+
-#TEMPLATE_VBOXR0_LDFLAGS.release     = -Wl,-S ???
-endif
@@ -1726 +1737 @@
-ifeq ($(KBUILD_TARGET),darwin)
-TEMPLATE_VBOXR0DRV_TOOL                = GXX4MACHO
-
+$(VBOX_DARWIN_DEF_SDK_DEFS) 
-# I didn't really know why we have to state explicitly the position of the
-# sdk headers. Maybe it has something to do with the fact that the kernel.framework
-# isn't a real framework according to http://developer.apple.com/qa/qa2001/qa1096.html.
-TEMPLATE_VBOXR0DRV_INCS               += $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/Kernel.framework/Headers
-
+$(VBOX_DARWIN_DEF_SDK_CXXFLAGS) 
-        -g -Wall -Wno-long-long -Wno-trigraphs -pipe -fno-common -nostdinc -fno-builtin -finline \
-        -fno-keep-inline-functions -force_cpusubtype_ALL -fno-exceptions -msoft-float -static \
@@ -1738 +1749 @@
-TEMPLATE_VBOXR0DRV_CXXFLAGS.profile    = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.release)
-TEMPLATE_VBOXR0DRV_CXXFLAGS.kprofile   = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.release)
-
+$(VBOX_DARWIN_DEF_SDK_CFLAGS) 
-        -g -Wall -Wno-long-long -Wno-trigraphs -pipe -fno-common -nostdinc -fno-builtin -finline \
-        -fno-keep-inline-functions -force_cpusubtype_ALL -fno-exceptions -msoft-float -static \
@@ -1745 +1756 @@
-TEMPLATE_VBOXR0DRV_CFLAGS.profile      = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.profile)
-TEMPLATE_VBOXR0DRV_CFLAGS.kprofile     = $(TEMPLATE_VBOXR0DRV_CXXFLAGS.kprofile)
-
+$(VBOX_DARWIN_DEF_SDK_LDFLAGS) 
-TEMPLATE_VBOXR0DRV_LIBS                = kmodc++ kmod cc_kext cpp_kext $(VBOX_GCC_LIBGCC)
-endif
@@ -1905 +1916 @@
-TEMPLATE_VBOXR3EXE_CFLAGS.debug        = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)
-TEMPLATE_VBOXR3EXE_CFLAGS.kprofile     = $(TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile)
-TEMPLATE_VBOXR3EXE_CFLAGS.darwin       = -fno-common
-TEMPLATE_VBOXR3EXE_CFLAGS.l4           = -nostdinc \
-        $(addprefix -I,$(VBOX_PATH_GCC_INCS) $(L4_INCDIR)) $(DEBUG_L4)
@@ -1932 +1942 @@
-TEMPLATE_VBOXR3EXE_TOOL                = GXX4MACHO
-TEMPLATE_VBOXR3EXE_LIBS                =
-
+
+
+
+
+
- else if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
-TEMPLATE_VBOXR3EXE_TOOL                = GXX3
@@ -2096 +2110 @@
-  endif
- endif # x86
+ TEMPLATE_VBOXNOCRTGCC_LDFLAGS.darwin   = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)
- TEMPLATE_VBOXNOCRTGCC_LIBS             = # FIXME - has unwind mess.
-endif
@@ -2186 +2201 @@
- else ifeq ($(KBUILD_TARGET),darwin)
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX4MACHO
+TEMPLATE_VBOXMAINEXE_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+TEMPLATE_VBOXMAINEXE_CFLAGS             += $(VBOX_DARWIN_DEF_SDK_CFLAGS)
+TEMPLATE_VBOXMAINEXE_CXXFLAGS           += $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+TEMPLATE_VBOXMAINEXE_OBJCFLAGS          += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
+TEMPLATE_VBOXMAINEXE_LDFLAGS            += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load -framework Carbon
-TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
-TEMPLATE_VBOXMAINEXE_LDFLAGS.darwin      = -bind_at_load -framework Carbon
- else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd)
-TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
@@ -2365 +2384 @@
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
- else ifeq ($(KBUILD_TARGET),darwin)
-
+
+
+
+
+
-  TEMPLATE_VBOXQTGUIEXE_LIBS +=
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH +=
@@ -2509 +2532 @@
- else ifeq ($(KBUILD_HOST),darwin)
-TEMPLATE_VBOXBLDPROG_TOOL                = GXX4MACHO
+TEMPLATE_VBOXBLDPROG_CFLAGS.darwin       = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -fno-common
+TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin     = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
+TEMPLATE_VBOXBLDPROG_OBJCFLAGS.darwin    = $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
+TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin      = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)
-TEMPLATE_VBOXBLDPROG_LIBS                =
- else if1of ($(KBUILD_HOST), freebsd netbsd openbsd)

trunk/configure

@@ -93 +93 @@
-if [ "`uname`" = "Darwin" ]; then
-  ECHO_N="/bin/echo -n"
- 
+
-  ECHO_N="echo -n"
-fi
@@ -279 +279 @@
-        LIB='lib64'
-      else
- 
- 
+
+
-        # alternative binaries can be found in 'amd64' subdirs of the 'bin'
-        # ones. So, in order to find the right stuff (esp. sdl-config) we'll
@@ -429 +429 @@
-        [ "$CC" = "gcc" ] && CC="gcc -m64"
-        [ "$CXX" = "g++" ] && CXX="g++ -m64"
- 
+
-    fi
-  fi
@@ -1445 +1445 @@
-#
-# Check for compiler.h
- 
- 
+
+
-# not succeed on openSUSE without it.
-#
@@ -1547 +1547 @@
-    9\.*)
-      darwin_ver="10.5"
-
+#
-      ;;
-    8\.*)
-5
+4
-      ;;
-    *)
@@ -1563 +1563 @@
-
-#
- 
- 
+
+
-# Note. Keep the which order in sync with the $(which ) in src/recompiler/Makefile.kmk.
-#

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -29 +29 @@
-TEMPLATE_XPCOM                     = XPCOM libraries (shared)
-TEMPLATE_XPCOM_EXTENDS             = VBOXR3NP
+## @todo correct inheritance here to make it use all the VBOXR3NP settings instead of overriding all of them.
-TEMPLATE_XPCOM_ASTOOL              = $(TEMPLATE_VBOXR3NP_TOOL)
-TEMPLATE_XPCOM_ASFLAGS             = $(NO_SUCH_VARIABLE)
@@ -41 +42 @@
-TEMPLATE_XPCOM_CXXFLAGS.release    = -O
-TEMPLATE_XPCOM_CXXFLAGS.profile    = -O
-
+ $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
-TEMPLATE_XPCOM_CXXFLAGS.freebsd    = -pthread
-TEMPLATE_XPCOM_CXXFLAGS.l4         = -fno-exceptions -nostdinc
@@ -60 +61 @@
-TEMPLATE_XPCOM_DEFS.x86            = i386=1
-TEMPLATE_XPCOM_DEFS.amd64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
-
+ $(TEMPLATE_VBOXR3NP_DEFS.darwin)
-TEMPLATE_XPCOM_DEFS.freebsd        = OSTYPE=\"FreeBSD5+\"   OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1
-TEMPLATE_XPCOM_DEFS.linux          = OSTYPE=\"Linux2.6\"    OSARCH=\"Linux\"  XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1
@@ -67 +68 @@
-TEMPLATE_XPCOM_DEFS.os2            = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"   XP_OS2 XP_PC OS2=4
-TEMPLATE_XPCOM_DEFS.solaris        = OSTYPE=\"Solaris10\"   OSARCH=\"Solaris\" XP_UNIX=1 XP_SOLARIS=1 HAVE_LIBDL=1 HAVE_SENDFILEV=1 SOLARIS=1 _REENTRANT
+## @todo The LDFLAGS inheriting is being hidden here and below where -fPIC is added.
-ifdef VBOX_WITH_ORIGIN
-TEMPLATE_XPCOM_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/'
@@ -72 +74 @@
-TEMPLATE_XPCOM_LDFLAGS.x86         = -m32
-TEMPLATE_XPCOM_LDFLAGS.amd64       = -m64
-
+TEMPLATE_
-                                     -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \
-                                     -framework CoreServices -framework CoreFoundation -framework Foundation -framework AppKit -framework Carbon
@@ -163 +165 @@
-TEMPLATE_XPCOMBLDPROG                   = XPCOM Build programs executables
-TEMPLATE_XPCOMBLDPROG_EXTENDS           = VBOXBLDPROG
+## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.)
-
-TEMPLATE_XPCOMBLDPROG_DEFS                      = $(TEMPLATE_BLDPROG_DEFS)                      $(TEMPLATE_XPCOMEXE_DEFS)