1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- 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,
+ 'os_ver%': 0,
+ 'prefix_dir%': '/usr',
+ '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.
@@ -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': [
['target_arch=="mipsel"', {
'werror%': '',
@@ -3610,6 +3614,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],
+ 'ldflags!': [
+ '-ldl',
+ '-pie',
+ ],
+ 'libraries!': [
+ '-ldl',
+ ],
},
}],
# Android-specific options; note that most are set above with Linux.
|
