Date: Sun, 13 Oct 2013 22:18:04 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330261 - in head/www/chromium: . files Message-ID: <201310132218.r9DMI4sN042546@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sun Oct 13 22:18:04 2013 New Revision: 330261 URL: http://svnweb.freebsd.org/changeset/ports/330261 Log: Fix build on FreeBSD >= 1000052 when the user has installed devel/libexecinfo Reported by: Sam Fourman Jr <sfourman@gmail.com> Tested by: Ivan Klymenko <fidaj@ukr.net> Added: head/www/chromium/files/patch-v8__src__platform-posix.h (contents, props changed) Modified: head/www/chromium/Makefile head/www/chromium/files/extra-patch-fixup-execinfo Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Sun Oct 13 22:16:20 2013 (r330260) +++ head/www/chromium/Makefile Sun Oct 13 22:18:04 2013 (r330261) @@ -29,8 +29,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ ninja:${PORTSDIR}/devel/ninja \ v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libcairo.so:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libasound.so:${PORTSDIR}/audio/alsa-lib \ @@ -143,9 +142,12 @@ GYP_DEFINES+= clang=1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OSVERSION} >= 1000052 +.if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif +.if ${OSVERSION} < 1000052 +LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo +.endif .if ${PORT_OPTIONS:MTEST} TEST_TARGETS= base_unittests \ Modified: head/www/chromium/files/extra-patch-fixup-execinfo ============================================================================== --- head/www/chromium/files/extra-patch-fixup-execinfo Sun Oct 13 22:16:20 2013 (r330260) +++ head/www/chromium/files/extra-patch-fixup-execinfo Sun Oct 13 22:18:04 2013 (r330261) @@ -1,13 +1,5 @@ --- v8/src/platform-posix.h.orig 2013-09-28 19:29:53.000000000 +0200 +++ v8/src/platform-posix.h 2013-10-11 17:28:41.000000000 +0200 -@@ -29,6 +29,7 @@ - #define V8_PLATFORM_POSIX_H_ - - #if !defined(ANDROID) -+#include <unistd.h> // size_t - #include <cxxabi.h> - #endif - #include <stdio.h> @@ -40,12 +41,12 @@ // Used by platform implementation files during OS::DumpBacktrace() Added: head/www/chromium/files/patch-v8__src__platform-posix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-v8__src__platform-posix.h Sun Oct 13 22:18:04 2013 (r330261) @@ -0,0 +1,10 @@ +--- v8/src/platform-posix.h.orig 2013-10-05 16:38:26.000000000 +0200 ++++ v8/src/platform-posix.h 2013-10-13 19:06:41.000000000 +0200 +@@ -28,6 +28,7 @@ + #ifndef V8_PLATFORM_POSIX_H_ + #define V8_PLATFORM_POSIX_H_ + ++#include <unistd.h> // size_t + #if !defined(ANDROID) + #include <cxxabi.h> + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310132218.r9DMI4sN042546>