mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
26 lines
1,022 B
Python
26 lines
1,022 B
Python
--- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC
|
|
+++ build/config/linux/pkg-config.py
|
|
@@ -57,8 +57,12 @@ def SetConfigPath(options):
|
|
print "You must specify an architecture via -a if using a sysroot."
|
|
sys.exit(1)
|
|
|
|
- libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig'
|
|
- libdir += ':' + sysroot + '/usr/share/pkgconfig'
|
|
+ if "linux" in sys.platform:
|
|
+ libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig'
|
|
+ libdir += ':' + sysroot + '/usr/share/pkgconfig'
|
|
+ elif "bsd" in sys.platform:
|
|
+ libdir = sysroot + '/libdata/pkgconfig'
|
|
+ libdir += ':' + '/usr/libdata/pkgconfig'
|
|
os.environ['PKG_CONFIG_LIBDIR'] = libdir
|
|
return libdir
|
|
|
|
@@ -107,7 +111,7 @@ def main():
|
|
# If this is run on non-Linux platforms, just return nothing and indicate
|
|
# success. This allows us to "kind of emulate" a Linux build from other
|
|
# platforms.
|
|
- if "linux" not in sys.platform:
|
|
+ if "bsd" not in sys.platform:
|
|
print "[[],[],[],[],[]]"
|
|
return 0
|
|
|