Changeset 4896 for trunk

Timestamp:

09/19/07 11:04:02 (1 year ago)

Author:

vboxsync

Message:

FreeBSD / cleanup.

Files:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (17 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -14 +14 @@
-#  distribution. VirtualBox OSE is distributed in the hope that it will
-#  be useful, but WITHOUT ANY WARRANTY of any kind.
+#
-
-DEPTH = ../../..
@@ -34 +35 @@
-TEMPLATE_XPCOM_CXXFLAGS.profile    = -O
-TEMPLATE_XPCOM_CXXFLAGS.darwin     = -fpascal-strings -fshort-wchar -fno-common -fno-rtti
+TEMPLATE_XPCOM_CXXFLAGS.freebsd    = -pthread
-TEMPLATE_XPCOM_CXXFLAGS.l4         = -fno-exceptions -nostdinc
-TEMPLATE_XPCOM_CXXFLAGS.linux      = -pthread
@@ -41 +43 @@
-TEMPLATE_XPCOM_CFLAGS.release      = -O
-TEMPLATE_XPCOM_CFLAGS.profile      = -O
+TEMPLATE_XPCOM_CFLAGS.freebsd      = -pthread
-TEMPLATE_XPCOM_CFLAGS.l4           = -nostdinc
-TEMPLATE_XPCOM_CFLAGS.linux        = -pthread -ansi
@@ -50 +53 @@
-TEMPLATE_XPCOM_DEFS.amd64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
-TEMPLATE_XPCOM_DEFS.darwin         = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1
+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
-TEMPLATE_XPCOM_DEFS.l4             = OSTYPE=\"L4ENV\"       OSARCH=\"L4\"     XP_UNIX=1 L4ENV HAVE_VISIBILITY_ATTRIBUTE=1
@@ -126 +130 @@
-        $(TARGET_VBox-xpcom-ipcshared) \
-        $(TARGET_VBoxXPCOM)
+TEMPLATE_XPCOMEXE_LIBS.freebsd     = $(LIB_PTHREAD)
-TEMPLATE_XPCOMEXE_LIBS.linux       = dl $(LIB_PTHREAD)
-TEMPLATE_XPCOMEXE_LIBS.l4          = $(LIB_RUNTIME) $(VBOX_GCC_LIBGCC)
@@ -149 +154 @@
-TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET_ARCH) = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET_ARCH)) $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET_ARCH))
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS          = -ansi -Wall -Wno-non-virtual-dtor
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.linux    = -pthread
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.release  = -O
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.profile  = -O
+TEMPLATE_XPCOMBLDPROG_CXXFLAGS.freebsd  = -pthread
+TEMPLATE_XPCOMBLDPROG_CXXFLAGS.linux    = -pthread
-TEMPLATE_XPCOMBLDPROG_CFLAGS            = -pipe -ansi -Wall -Wno-unused
-TEMPLATE_XPCOMBLDPROG_CFLAGS.linux      = -pthread
-TEMPLATE_XPCOMBLDPROG_CFLAGS.release    = -O
-TEMPLATE_XPCOMBLDPROG_CFLAGS.profile    = -O
+TEMPLATE_XPCOMBLDPROG_CFLAGS.freebsd    = -pthread
+TEMPLATE_XPCOMBLDPROG_CFLAGS.linux      = -pthread
-TEMPLATE_XPCOMBLDPROG_INCS              = $(VBOX_PATH_SDK)/include \
-                                          $(VBOX_PATH_SDK)/include/xpcom \
@@ -610 +617 @@
-        _PR_PTHREADS
-VBox-xpcom-nspr_DEFS.freebsd = \
+        FREEBSD=1 \
-        HAVE_CVAR_BUILT_ON_SEM \
-        _PR_PTHREADS
+## @todo filling in the missing stuff, please don't just copy it from linux.
-# FIXME: LINUX should be defined by _linux.cfg
-VBox-xpcom-nspr_DEFS.linux = \
@@ -707 +716 @@
-        nsprpub/lib/libc/src/plgetopt.c
-
-
+
+
-        nsprpub/pr/src/md/unix/unix.c \
-        nsprpub/pr/src/md/unix/unix_errors.c \
@@ -714 +724 @@
-        nsprpub/pr/src/md/unix/uxshm.c \
-        nsprpub/pr/src/md/unix/uxwrap.c \
-        nsprpub/pr/src/md/unix/darwin.c \
-        nsprpub/pr/src/pthreads/ptio.c \
-        nsprpub/pr/src/pthreads/ptsynch.c \
-        nsprpub/pr/src/pthreads/ptthread.c \
-        nsprpub/pr/src/pthreads/ptmisc.c
+endif
+
+VBox-xpcom-nspr_SOURCES.darwin = nsprpub/pr/src/md/unix/darwin.c
-VBox-xpcom-nspr_SOURCES.darwin.x86 = nsprpub/pr/src/md/unix/os_Darwin_x86.s
-
-
+
+
+
-        nsprpub/pr/src/io/prfile.c /* why not for Linux? */ \
-        nsprpub/pr/src/io/prio.c   /*  ""   ""  ""   ""  */ \
@@ -745 +759 @@
-VBox-xpcom-nspr_SOURCES.l4.amd64 = nsprpub/pr/src/md/unix/os_Linux_x86_64.s
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-VBox-xpcom-nspr_SOURCES.linux.x86 = nsprpub/pr/src/md/unix/os_Linux_x86.s
-VBox-xpcom-nspr_SOURCES.linux.amd64 = nsprpub/pr/src/md/unix/os_Linux_x86_64.s
-
- 
+
-        nsprpub/pr/src/io/prdir.c \
-        nsprpub/pr/src/io/prfile.c \
@@ -786 +789 @@
-        nsprpub/pr/src/threads/combined/pruthr.c
-# gcc/emx sources
- 
+
-        nsprpub/pr/src/md/os2/os2emx.s \
-        nsprpub/pr/src/md/os2/os2vaclegacy.s
@@ -793 +796 @@
-#       nsprpub/pr/src/md/os2/os2vacpp.asm
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-VBox-xpcom-nspr_SOURCES.solaris.x86 = nsprpub/pr/src/md/unix/os_SunOS_x86.s
-VBox-xpcom-nspr_SOURCES.solaris.amd64 = nsprpub/pr/src/md/unix/os_SunOS_amd64.s
@@ -978 +970 @@
-VBox-xpcom-xptcall_SOURCES.darwin.x86  = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
+VBox-xpcom-xptcall_SOURCES.freebsd.x86 = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
+                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
+VBox-xpcom-xptcall_SOURCES.freebsd.amd64= xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp \
+                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp ## ???
-VBox-xpcom-xptcall_SOURCES.linux.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
@@ -1062 +1058 @@
-        $(TARGET_VBox-xpcom-nspr)
-
-
+
+
-        $(TARGET_VBox-xpcom-typelib) \
-        $(TARGET_VBox-xpcom-string) \
@@ -1075 +1072 @@
-        $(TARGET_VBox-xpcom-nspr) \
-        -Wl,--no-whole-archive
+endif
+
-VBoxXPCOM_LDFLAGS.solaris = -Wl,-z,allextract \
-        $(TARGET_VBox-xpcom-typelib) \
@@ -1173 +1172 @@
-        ipc/ipcd/client/src/ipcModuleFactory.cpp \
-        ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
-
+
+
-        ipc/ipcd/client/src/ipcConnectionWin.cpp
-
+
+
-        ipc/ipcd/client/src/ipcConnectionUnix.cpp
-
-
-
-
-
-
-
-
+
-VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxXPCOMIPCC.dylib
-VBoxXPCOMIPCC_LIBS = \
@@ -1202 +1196 @@
-        ipc/ipcd/daemon/src/ipcModuleReg.cpp \
-        ipc/ipcd/daemon/src/ipcCommandModule.cpp
-
+
+
-        ipc/ipcd/daemon/src/ipcdWin.cpp
-
+
+
-        ipc/ipcd/daemon/src/ipcdUnix.cpp
-
-
-
-
-
-
-
-
+
-
-#