(src_VBox_Runtime_VBox_log-vbox_cpp) Add NetBSD -> elif defined( RT_OS_FREEBSD) || defined(RT_OS_NETBSD) (TODO) update for error status.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (src_VBox_Runtime_VBox_log-vbox_cpp) Add NetBSD -> elif defined( RT_OS_FREEBSD) || defined(RT_OS_NETBSD) (TODO) update for error status.
From: Makoto Fujiwara <makoto%ki.nu@localhost>
Date: Tue, 22 Sep 2015 12:15:49 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Tue Sep 22 21:15:49 2015 +0900
Changeset:	ccaeb92253d1d0910ab7ba23aea86c067cc94126

Modified Files:
	virtualbox-ose/TODO
	virtualbox-ose/distinfo
	virtualbox-ose/patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp

Log Message:
(src_VBox_Runtime_VBox_log-vbox_cpp) Add NetBSD
 -> elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
(TODO) update for error status.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ccaeb92253d1d0910ab7ba23aea86c067cc94126

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-ose/TODO                                | 45 +++-------------------
 virtualbox-ose/distinfo                            |  2 +-
 .../patch-src_VBox_Runtime_VBox_log-vbox_cpp       | 13 ++++++-
 3 files changed, 17 insertions(+), 43 deletions(-)

diffs:
diff --git a/virtualbox-ose/TODO b/virtualbox-ose/TODO
index 976cdb5..e7de3e9 100644
--- a/virtualbox-ose/TODO
+++ b/virtualbox-ose/TODO
@@ -6,47 +6,12 @@
    See http://svnweb.freebsd.org/ports/head/emulators/virtualbox-ose/
  - Thus there should be so many things to adjust from FreeBSD to pkgsrc
 
- - Now you need to adjust src/VBox/Runtime/VBox/log-vbox.cpp first, say,
-   patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp
-
  - Current build status (errors are):
 
-(1) before patch to src/VBox/Runtime/VBox/log-vbox.cpp 
-------------------------------------------------------
-kBuild: Compiling RuntimeBldProg - /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:420:5: error: #error needs porting.
- #   error needs porting.
-     ^
-kmk: *** [/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/VBox/log-vbox.o] Error 1
+/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp:101: undefined reference to `RTFileSeek'
+ld: /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm: hidden symbol `rtThreadNativeDestroy' isn't defined
+ld: final link failed: Bad value
+kmk: *** [/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm] Error 1
 The failing command:
-@c++ -c -O2 -g -pipe -pedantic -Wshadow -Wshadow -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-trigraphs -fdiagnostics-show-option -Wno-unused-parameter -Wno-long-long -Wno-long-long -Wno-delete-non-virtual-dtor -Wno-variadic-macros -O2 -fno-omit-frame-pointer -fno-strict-aliasing -m64 -I/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/include -I/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/libs/liblzf-3.4 -I/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/libs/kStuff/kStuff/include -I/usr/local/include -I/usr/pkg/include/libxml2 -I/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/include -I/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DVBOX_WITH_DEBUGGER -DRT_OS_NETBSD -DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_HARDENING -D_REENTRANT -DIN_RING3 -DLOG_DISABLED -DIN_RT_R3 -DIN_RT_R3 -DLDR_WITH_NATIVE -DLDR_WI
TH_ELF32 -DLDR_WITH_PE -DRT_WITH_VBOX -DRT_NO_GIP -DRT_WITHOUT_NOCRT_WRAPPERS -DIPRT_WITH_OPENSSL -DLDR_WITH_KLDR -DRT_WITH_ICONV_CACHE -DIPRT_WITHOUT_LDR_VERIFY -DRT_NO_GIP -Wp,-MD,/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/VBox/log-vbox.o.dep -Wp,-MT,/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/VBox/log-vbox.o -Wp,-MP -o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/VBox/log-vbox.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp
+@c++                  -m64   -o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scm.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmdiff.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmrw.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmstream.o /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/scm/scmsubversion.o   -L/usr/local/lib   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/RuntimeBldProg.a   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/VBox-kStuffStaticBldProg.a   /export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/lib/Runtime
BldProg.a   -lpthread
 *** Error code 2
-
-Stop.
-make[1]: stopped in /usr/pkgsrc/wip/virtualbox-ose
-*** Error code 1
-
-Stop.
-make: stopped in /usr/pkgsrc/wip/virtualbox-ose
-h97@makoto 17:51:24/150922(..wip/virtualbox-ose)% 
-
-(2) after easy patch to src/VBox/Runtime/VBox/log-vbox.cpp:
-
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp: In function 'RTLOGGER* RTLogDefaultInit()':
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:386:21: error: 'CTL_KERN' was not declared in this scope
-         aiName[0] = CTL_KERN;
-                     ^
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:387:21: error: 'KERN_PROC' was not declared in this scope
-         aiName[1] = KERN_PROC;
-                     ^
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:388:21: error: 'KERN_PROC_ARGS' was not declared in this scope
-         aiName[2] = KERN_PROC_ARGS;     /* Introduced in FreeBSD 4.0 */
-                     ^
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:389:28: error: 'getpid' was not declared in this scope
-         aiName[3] = getpid();
-                            ^
-/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/src/VBox/Runtime/VBox/log-vbox.cpp:391:80: error: 'sysctl' was not declared in this scope
-         int rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), NULL, &cchArgs, NULL, 0);
-                                                                                ^
-kmk: *** [/export/WRKOBJDIR/wip/virtualbox-ose/work/VirtualBox-4.3.30/out/netbsd.amd64/release/obj/RuntimeBldProg/VBox/log-vbox.o] Error 1
-The failing command:
diff --git a/virtualbox-ose/distinfo b/virtualbox-ose/distinfo
index 8c1cac6..c4fb7a9 100644
--- a/virtualbox-ose/distinfo
+++ b/virtualbox-ose/distinfo
@@ -59,5 +59,5 @@ SHA1 (patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp) = c14f53cbfd5b52c441a901b9
 SHA1 (patch-src-recompiler-Sun-testmath.c) = 89c5f18ff91b21da7e6096ef27421a05897bd76d
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_postflight) = 7ca0133e7027a96779fa27cb0f525ed72d00e7c2
 SHA1 (patch-src_VBox_Installer_darwin_VirtualBox_preflight) = e4a020048a70095679f3e6716b242563e982608e
-SHA1 (patch-src_VBox_Runtime_VBox_log-vbox_cpp) = 94e6f6db208562682f8d5229b7e8273f62b08d82
+SHA1 (patch-src_VBox_Runtime_VBox_log-vbox_cpp) = 836ffb311768cec7eb8ab6a08381a746e2b082ec
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk__sh) = 62e37d27d94330ff441ceaf47d111353bb696b2e
diff --git a/virtualbox-ose/patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp b/virtualbox-ose/patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp
index f363f11..97ebeb4 100644
--- a/virtualbox-ose/patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp
+++ b/virtualbox-ose/patches/patch-src_VBox_Runtime_VBox_log-vbox_cpp
@@ -1,7 +1,16 @@
 $NetBSD$
 
---- src/VBox/Runtime/VBox/log-vbox.cpp~	2015-07-10 23:31:43.000000000 +0900
-+++ src/VBox/Runtime/VBox/log-vbox.cpp	2015-09-22 18:04:09.000000000 +0900
+--- src/VBox/Runtime/VBox/log-vbox.cpp.orig	2015-07-10 23:31:43.000000000 +0900
++++ src/VBox/Runtime/VBox/log-vbox.cpp	2015-09-22 21:11:26.000000000 +0900
+@@ -131,7 +131,7 @@
+ #  include <Windows.h>
+ # elif defined(RT_OS_LINUX)
+ #  include <unistd.h>
+-# elif defined(RT_OS_FREEBSD)
++# elif defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+ #  include <sys/param.h>
+ #  include <sys/sysctl.h>
+ #  include <sys/user.h>
 @@ -380,7 +380,7 @@ RTDECL(PRTLOGGER) RTLogDefaultInit(void)
              RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %.64s\n", info.args);
          }
Prev by Date: Delete unused lines. Correction to ONLY_FOR_PLATFORM. Add glib2/ buildlink3.mk
Next by Date: lldb-git: fix URLs for github checkout
Previous by Thread: Delete unused lines. Correction to ONLY_FOR_PLATFORM. Add glib2/ buildlink3.mk
Next by Thread: lldb-git: fix URLs for github checkout
Indexes:
Home | Main Index | Thread Index | Old Index