pkgconfig.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
  2. Signed-off-by: Ross Burton <ross.burton@intel.com>
  3. From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
  4. From: Ross Burton <ross.burton@intel.com>
  5. Date: Thu, 20 Sep 2018 20:12:24 +0100
  6. Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
  7. Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
  8. simply get all of the CFLAGS. Aside from completeness, this helps builds in
  9. sysroots as pkg-config knows what to do with --cflags but doesn't remap
  10. arbitrary variables.
  11. Signed-off-by: Ross Burton <ross.burton@intel.com>
  12. ---
  13. xorg-server.m4 | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git a/xorg-server.m4 b/xorg-server.m4
  16. index 18255b91a..195bda5d8 100644
  17. --- a/xorg-server.m4
  18. +++ b/xorg-server.m4
  19. @@ -31,7 +31,7 @@ dnl
  20. AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
  21. AC_REQUIRE([PKG_PROG_PKG_CONFIG])
  22. SAVE_CFLAGS="$CFLAGS"
  23. - CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
  24. + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
  25. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  26. #include "xorg-server.h"
  27. #if !defined $1
  28. --
  29. 2.11.0