upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

scons: don't let pkg-config to add prefix on msys2

Browse Source 
This is workaround for windows style path confusing scons if they appear
in CPPATH etc. Paths without prefix still happen to be valid and they
start with "/", not "c:".

(cherry-picked from commit b347bc70b163a572751b7ac72f23e472c3ac9238)
This commit is contained in:
loonycyborg 2018-06-01 22:45:45 +03:00
parent 13c5f02e04
commit ffb078c119
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -355,6 +355,9 @@ if env["prereqs"]:
conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
conf.CheckSDL("SDL2_image", header_file = "SDL_image")
if sys.platform == "msys":
env["PKG_CONFIG_FLAGS"] = "--dont-define-prefix"
have_server_prereqs = (\
conf.CheckCPlusPlus(gcc_version = "4.8") & \
conf.CheckLib("libcrypto") & \

4
scons/cairo.py
View File

@ -12,12 +12,12 @@ def CheckCairo(context, min_version):
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))
if sys.platform != "win32":
env["PKGCONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
env["PKG_CONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH", "")
version_arg = env["ESCAPE"](" >= ") + min_version
env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS cairo" + version_arg)
env.ParseConfig("pkg-config --libs --cflags $PKG_CONFIG_FLAGS cairo" + version_arg)
context.Result("yes")
return True
except OSError:

4
scons/pango.py
View File

@ -12,14 +12,14 @@ def CheckPango(context, backend, require_version = None):
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))
if sys.platform != "win32":
env["PKGCONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
env["PKG_CONFIG_FLAGS"] = "--define-variable=prefix=" + gtkdir
try:
env["ENV"]["PKG_CONFIG_PATH"] = environ.get("PKG_CONFIG_PATH", "")
version_arg = ""
if require_version:
version_arg = env["ESCAPE"](" >= ") + require_version
env.ParseConfig("pkg-config --libs --cflags $PKGCONFIG_FLAGS pango" + backend + version_arg)
env.ParseConfig("pkg-config --libs --cflags $PKG_CONFIG_FLAGS pango" + backend + version_arg)
context.Result("yes")
return True
except OSError:

4
scons/pkgconfig.py
View File

@ -1,12 +1,12 @@
# vi: syntax=python:et:ts=4
import os
import os, sys
def run_pkg_config(context, name):
env = context.env
try:
env["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH", "")
env.ParseConfig("pkg-config --libs --cflags --silence-errors $PKGCONFIG_FLAGS \"" + name + "\"")
env.ParseConfig("pkg-config --libs --cflags $PKG_CONFIG_FLAGS --silence-errors $PKGCONFIG_FLAGS \"" + name + "\"")
context.Log("Found '" + name + "' with pkg-config.\n")
return True
except OSError:

2
scons/sdl.py
View File

@ -46,7 +46,7 @@ def CheckSDL(context, sdl_lib = "SDL", require_version = None, header_file = Non
env["ENV"]["PKG_CONFIG_PATH"] = PrependPath(environ.get("PKG_CONFIG_PATH", ""), join(sdldir, "lib/pkgconfig"))
if env["PLATFORM"] != "win32" or sys.platform == "msys":
for foo_config in [
"pkg-config --cflags --libs %s" % sdl_lib_name_pkgconfig,
"pkg-config --cflags --libs $PKG_CONFIG_FLAGS %s" % sdl_lib_name_pkgconfig,
"%s --cflags --libs" % sdl_config_name
]:
try: