From fd42db911c202c03e8fc0fbce37b23737c18060b Mon Sep 17 00:00:00 2001 From: Ivan Nedrehagen Date: Wed, 25 Mar 2015 14:31:16 +0100 Subject: [PATCH] workaround to a bug where pwd / -W returns a path with slashes. --- mingw-w64-pkg-config/0005-mangle.mingw.patch | 14 +++++++------- mingw-w64-pkg-config/PKGBUILD | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mingw-w64-pkg-config/0005-mangle.mingw.patch b/mingw-w64-pkg-config/0005-mangle.mingw.patch index 4435ec3d07..cbb228dd30 100644 --- a/mingw-w64-pkg-config/0005-mangle.mingw.patch +++ b/mingw-w64-pkg-config/0005-mangle.mingw.patch @@ -12,28 +12,28 @@ diff --git a/check/check-sysroot b/check/check-sysroot index 0820206..d03d1c7 100755 --- a/check/check-sysroot +++ b/check/check-sysroot -@@ -6,6 +6,11 @@ set -e - +@@ -6,6 +6,12 @@ set -e + export PKG_CONFIG_SYSROOT_DIR=/sysroot - + +# MSYS mangles / paths to its own root in windows format. This probably +# means sysroot doesn't work there, but match what pkg-config passes +# back anyway. +[ "x$OSTYPE" = "xmsys" ] && root=$(cd / && pwd -W) || root= ++root=${root%/} + RESULT="" run_test --cflags simple - + @@ -20,8 +25,8 @@ if [ "$list_indirect_deps" = yes ]; then fi run_test --libs --static simple - + -RESULT="-I/sysroot/public-dep/include" +RESULT="-I$root/sysroot/public-dep/include" run_test --cflags public-dep - + -RESULT="-L/sysroot/public-dep/lib -lpublic-dep" +RESULT="-L$root/sysroot/public-dep/lib -lpublic-dep" run_test --libs public-dep -- 1.8.1.4 - diff --git a/mingw-w64-pkg-config/PKGBUILD b/mingw-w64-pkg-config/PKGBUILD index 0e8b73b293..4d6d4878c0 100644 --- a/mingw-w64-pkg-config/PKGBUILD +++ b/mingw-w64-pkg-config/PKGBUILD @@ -27,7 +27,7 @@ md5sums=('aa3c86e67551adc3ac865160e34a2a0d' '073729fca79eb7415a88eec68504dc92' 'a14107b8eb8640aac2e59798467128a3' 'a605f371133ea78af740109a2b690a69' - '2b5a8f14761eaee3ccc35d8d24aace9f' + '0824f3b39004b24168b98280160e4045' '27602f99a978c28f963afe9313fd1604' 'e1b804a1b0a15e9af895f6fd92907f23' '2ba25b1a52a48afa0d2e1b0e06aaa07c'