diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-02-26 08:27:57 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-02-26 08:27:57 +0000 |
| commit | b9c17ca96dfd78ec619b879ec16221edd875587e (patch) | |
| tree | 81f60c51b929f824ed7d62055fb95c99333f46df | |
| parent | 7dd460c20ab26558f9b06bd3cbb7bdaca0a215fb (diff) | |
| download | ports-b9c17ca96dfd78ec619b879ec16221edd875587e.tar.gz ports-b9c17ca96dfd78ec619b879ec16221edd875587e.zip | |
MFH: r346081
Add a patch that slipped through first to try to fix the build once more ...
Noticed by: John Carr, nox
Approved by: portmgr (erwin, implicit)
Notes
Notes:
svn path=/branches/2014Q1/; revision=346138
| -rw-r--r-- | www/chromium/files/patch-build__common.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 496c12158060..245b46e767a0 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,6 +1,15 @@ ---- build/common.gypi.orig 2012-05-30 10:01:43.000000000 +0300 -+++ build/common.gypi 2012-06-05 23:01:25.000000000 +0300 -@@ -575,6 +575,10 @@ +--- build/common.gypi.orig 2014-02-20 21:28:44.000000000 +0100 ++++ build/common.gypi 2014-02-24 23:02:26.000000000 +0100 +@@ -573,7 +573,7 @@ + }], + + # DBus usage. +- ['OS=="linux" and embedded==0', { ++ ['(OS=="linux" or OS=="freebsd") and embedded==0', { + 'use_dbus%': 1, + }, { + 'use_dbus%': 0, +@@ -1008,6 +1008,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -11,16 +20,16 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -806,7 +810,7 @@ - # This is used to tweak build flags for gcc 4.4. - 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', +@@ -1283,7 +1287,7 @@ + }], + ['os_posix==1 and OS!="mac" and OS!="ios"', { # Figure out the python architecture to decide if we build pyauto. - 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)', + 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)', 'conditions': [ - ['branding=="Chrome"', { - 'linux_breakpad%': 1, -@@ -2278,6 +2282,13 @@ + ['target_arch=="mipsel"', { + 'werror%': '', +@@ -3610,6 +3614,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], |