Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2014 00:13:30 +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: r346081 - head/www/chromium/files
Message-ID:  <201402260013.s1Q0DUsE093662@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Wed Feb 26 00:13:30 2014
New Revision: 346081
URL: http://svnweb.freebsd.org/changeset/ports/346081
QAT: https://qat.redports.org/buildarchive/r346081/

Log:
  Add a patch that slipped through first to try to fix the build once more ...
  
  Noticed by:	John Carr, nox

Modified:
  head/www/chromium/files/patch-build__common.gypi

Modified: head/www/chromium/files/patch-build__common.gypi
==============================================================================
--- head/www/chromium/files/patch-build__common.gypi	Tue Feb 25 23:49:18 2014	(r346080)
+++ head/www/chromium/files/patch-build__common.gypi	Wed Feb 26 00:13:30 2014	(r346081)
@@ -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',
          ],



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402260013.s1Q0DUsE093662>