diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2013-10-13 22:18:04 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2013-10-13 22:18:04 +0000 |
| commit | 70377e983a0e294ed9cb2ee2fbeff4c39278dd99 (patch) | |
| tree | e1584e55d91eba76029934edef1cf6ea4d7a0a51 | |
| parent | Remove unmaintained ports which depends on Linux GTK1 libraries: (diff) | |
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>
Notes
Notes:
svn path=/head/; revision=330261
| -rw-r--r-- | www/chromium/Makefile | 8 | ||||
| -rw-r--r-- | www/chromium/files/extra-patch-fixup-execinfo | 8 | ||||
| -rw-r--r-- | www/chromium/files/patch-v8__src__platform-posix.h | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index e610dffb9d58..a0c541078632 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -29,8 +29,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/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 \ diff --git a/www/chromium/files/extra-patch-fixup-execinfo b/www/chromium/files/extra-patch-fixup-execinfo index 21ff8f3940df..2e39dc16f0c6 100644 --- a/www/chromium/files/extra-patch-fixup-execinfo +++ b/www/chromium/files/extra-patch-fixup-execinfo @@ -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() diff --git a/www/chromium/files/patch-v8__src__platform-posix.h b/www/chromium/files/patch-v8__src__platform-posix.h new file mode 100644 index 000000000000..45879f024872 --- /dev/null +++ b/www/chromium/files/patch-v8__src__platform-posix.h @@ -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 |