Date: Fri, 21 Feb 2014 21:22:57 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345546 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-additions/files virtualbox-ose-legacy virtualbox-ose-legacy/files virtualbox-ose/files Message-ID: <201402212122.s1LLMvPX068065@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Feb 21 21:22:56 2014 New Revision: 345546 URL: http://svnweb.freebsd.org/changeset/ports/345546 QAT: https://qat.redports.org/buildarchive/r345546/ Log: Fix build after re-appearance of converters/libiconv on 10+ (r341775). Obtained from: svn.redports.org/virtualbox PR: ports/186847 Added: head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk (contents, props changed) Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-legacy/Makefile head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-Makefile.kmk head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Fri Feb 21 21:22:17 2014 (r345545) +++ head/emulators/virtualbox-ose-additions/Makefile Fri Feb 21 21:22:56 2014 (r345546) @@ -108,6 +108,7 @@ post-patch: .if empty(ICONV_LIB) @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \ ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk + @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif pre-build: Added: head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk Fri Feb 21 21:22:56 2014 (r345546) @@ -0,0 +1,14 @@ +--- src/VBox/Runtime/Makefile.kmk.orig 2013-12-18 11:10:31.000000000 -0500 ++++ src/VBox/Runtime/Makefile.kmk 2014-02-20 18:14:28.000000000 -0500 +@@ -157,6 +157,11 @@ + IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\" + + # ++# Set the defines that utf8-posix.cpp needs. It's used by several targets. ++# ++r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS) ++ ++# + # Unicode Specification reader used to regenerate unidata.cpp. + # + uniread_TEMPLATE = VBOXBLDPROG Modified: head/emulators/virtualbox-ose-legacy/Makefile ============================================================================== --- head/emulators/virtualbox-ose-legacy/Makefile Fri Feb 21 21:22:17 2014 (r345545) +++ head/emulators/virtualbox-ose-legacy/Makefile Fri Feb 21 21:22:56 2014 (r345546) @@ -212,6 +212,7 @@ post-patch: @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure .if empty(ICONV_LIB) @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk + @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif pre-build: Modified: head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-Makefile.kmk Fri Feb 21 21:22:17 2014 (r345545) +++ head/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-Makefile.kmk Fri Feb 21 21:22:56 2014 (r345546) @@ -1,6 +1,18 @@ ---- src/VBox/Runtime/Makefile.kmk.orig 2013-06-21 16:27:18.000000000 +0400 -+++ src/VBox/Runtime/Makefile.kmk 2013-06-30 14:57:33.248215681 +0400 -@@ -844,7 +844,7 @@ +--- src/VBox/Runtime/Makefile.kmk.orig 2014-01-11 03:17:44.000000000 -0500 ++++ src/VBox/Runtime/Makefile.kmk 2014-02-20 19:18:26.000000000 -0500 +@@ -141,6 +141,11 @@ + IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\" + + # ++# Set the defines that utf8-posix.cpp needs. It's used by several targets. ++# ++r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS) ++ ++# + # Unicode Specification reader used to regenerate unidata.cpp. + # + uniread_TEMPLATE = VBOXBLDPROG +@@ -844,7 +849,7 @@ r3/posix/RTMemProtect-posix.cpp \ r3/posix/RTPathUserHome-posix.cpp \ r3/posix/RTSystemQueryOSInfo-posix.cpp \ Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Fri Feb 21 21:22:17 2014 (r345545) +++ head/emulators/virtualbox-ose/Makefile Fri Feb 21 21:22:56 2014 (r345546) @@ -221,6 +221,7 @@ post-patch: @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure .if empty(ICONV_LIB) @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk + @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif pre-build: Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk Fri Feb 21 21:22:17 2014 (r345545) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk Fri Feb 21 21:22:56 2014 (r345546) @@ -1,6 +1,18 @@ ---- src/VBox/Runtime/Makefile.kmk.orig 2013-06-21 16:27:18.000000000 +0400 -+++ src/VBox/Runtime/Makefile.kmk 2013-06-30 14:57:33.248215681 +0400 -@@ -844,7 +844,7 @@ +--- src/VBox/Runtime/Makefile.kmk.orig 2013-12-18 11:10:31.000000000 -0500 ++++ src/VBox/Runtime/Makefile.kmk 2014-02-20 18:14:28.000000000 -0500 +@@ -157,6 +157,11 @@ + IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\" + + # ++# Set the defines that utf8-posix.cpp needs. It's used by several targets. ++# ++r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS) ++ ++# + # Unicode Specification reader used to regenerate unidata.cpp. + # + uniread_TEMPLATE = VBOXBLDPROG +@@ -906,7 +911,7 @@ r3/posix/RTMemProtect-posix.cpp \ r3/posix/RTPathUserHome-posix.cpp \ r3/posix/RTSystemQueryOSInfo-posix.cpp \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402212122.s1LLMvPX068065>