mirror of
https://git.freebsd.org/ports.git
synced 2025-07-04 02:49:14 -04:00
9762000554
variable. - Remove our base GCC specific settings. Submitted by: George Liaskos Obtained from: http://trillian.chruetertee.ch/chromium/changeset/342
37 lines
1.4 KiB
Python
37 lines
1.4 KiB
Python
--- build/common.gypi.orig 2012-05-23 04:50:12.000000000 +0300
|
|
+++ build/common.gypi 2012-05-30 18:47:53.000000000 +0300
|
|
@@ -509,6 +509,11 @@
|
|
# able to turn it off for various reasons.
|
|
'linux_disable_pie%': 0,
|
|
|
|
+ 'os_ver%': 0,
|
|
+ 'prefix_dir%': '/usr',
|
|
+ 'use_system_tcmalloc%': 0,
|
|
+ 'use_system_libjpeg%': 0,
|
|
+
|
|
# 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.
|
|
@@ -739,7 +744,7 @@
|
|
# This is used to tweak build flags for gcc 4.4.
|
|
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
|
|
# 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,
|
|
@@ -2172,6 +2177,13 @@
|
|
'ldflags': [
|
|
'-Wl,--no-keep-memory',
|
|
],
|
|
+ 'ldflags!': [
|
|
+ '-ldl',
|
|
+ '-pie',
|
|
+ ],
|
|
+ 'libraries!': [
|
|
+ '-ldl',
|
|
+ ],
|
|
},
|
|
}],
|
|
# Android-specific options; note that most are set above with Linux.
|