tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure pkg-config includes all system folders

Browse Source
This commit is contained in:
Konstantin Käfer
2014-04-17 09:52:15 -07:00
parent e7274c7866
commit 871bb9d02e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -38,12 +38,14 @@ def pkg_config(pkg, pkgconfig_root):
env = os.environ.copy()
if pkgconfig_root:
env["PKG_CONFIG_PATH"] = pkgconfig_root
env["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "1"
env["PKG_CONFIG_ALLOW_SYSTEM_LIBS"] = "1"
cmd = subprocess.Popen(['pkg-config', '--static', '--libs', pkg], stdout=subprocess.PIPE, env=env)
libs, ret = cmd.communicate()
if (ret): return None
cmd = subprocess.Popen(['pkg-config', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
cflags, red = cmd.communicate()
cmd = subprocess.Popen(['pkg-config', '--static', '--cflags', pkg], stdout=subprocess.PIPE, env=env)
cflags, ret = cmd.communicate()
if (ret): return None
return (libs, cflags)

4
setup-libraries.sh
View File

@@ -61,7 +61,7 @@ rm -rf out/packages
cd ../../
./configure \
--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig \
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal
elif [ ${UNAME} = 'Linux' ]; then
@@ -78,6 +78,6 @@ rm -rf out/packages
cd ../../
./configure \
--pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/lib/pkgconfig \
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/
--boost=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64
fi