From 55b6aa2f8528e13a77cf258842abf1d03bef2bc5 Mon Sep 17 00:00:00 2001 From: "SENOO, Ken" Date: Sat, 8 Jun 2019 14:24:40 +0900 Subject: [PATCH 1/2] Fix "FAIL: check-system-flags" pkg-config strips system include and lib. For passing the test, enable system include and lib by appending PKG_CONFIG_ALLOW_SYSTEM_CFLAGS and PKG_CONFIG_ALLOW_SYSTEM_LIBS environemnt variable. --- check/check-system-flags | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check/check-system-flags b/check/check-system-flags index 632496c..e9511b7 100755 --- a/check/check-system-flags +++ b/check/check-system-flags @@ -34,10 +34,10 @@ PKG_CONFIG_SYSTEM_INCLUDE_PATH=/foo/include PKG_CONFIG_SYSTEM_LIBRARY_PATH=/foo/lib RESULT="-I/usr/include" -run_test --cflags system +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 rrun_test --cflags system RESULT="-L/usr/lib -lsystem" -run_test --libs system +PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 rrun_test --libs system # Now check that the various GCC environment variables also update the # system include path @@ -56,7 +56,7 @@ done # system include path when --msvc-syntax is in use for var in INCLUDE; do RESULT="-I/usr/include" - eval $var=/usr/include run_test --cflags system + eval PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 r$var=/usr/include run_test --cflags system # Make sure these are skipped in --msvc-syntax mode if [ "$native_win32" = yes ]; then From 40b6371b134ba679fe927d4e3dc8b431213bc2d6 Mon Sep 17 00:00:00 2001 From: "SENOO, Ken" Date: Sat, 8 Jun 2019 15:13:50 +0900 Subject: [PATCH 2/2] Fix typo. --- check/check-system-flags | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check/check-system-flags b/check/check-system-flags index e9511b7..e2e6633 100755 --- a/check/check-system-flags +++ b/check/check-system-flags @@ -34,10 +34,10 @@ PKG_CONFIG_SYSTEM_INCLUDE_PATH=/foo/include PKG_CONFIG_SYSTEM_LIBRARY_PATH=/foo/lib RESULT="-I/usr/include" -PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 rrun_test --cflags system +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 run_test --cflags system RESULT="-L/usr/lib -lsystem" -PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 rrun_test --libs system +PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 run_test --libs system # Now check that the various GCC environment variables also update the # system include path @@ -56,7 +56,7 @@ done # system include path when --msvc-syntax is in use for var in INCLUDE; do RESULT="-I/usr/include" - eval PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 r$var=/usr/include run_test --cflags system + eval PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 $var=/usr/include run_test --cflags system # Make sure these are skipped in --msvc-syntax mode if [ "$native_win32" = yes ]; then