lang/vala/patches/001-circumvent-glib-pkgconf-bug.patch

   1 This patch circumvents an apparent bug in pkgconf 1.9 that prevents
   2 building the OpenWrt Vala package. For a discussion of this, see:
   3
   4 https://github.com/openwrt/packages/issues/21359
   5
   6 The pkgconf bug seems similar to the one discussed here:
   7
   8 https://github.com/pkgconf/pkgconf/issues/268
   9
  10 --- a/configure
  11 +++ b/configure
  12 @@ -13598,11 +13598,11 @@ if test -n "$GLIB_CFLAGS"; then
  13   elif test -n "$PKG_CONFIG"; then
  14      if test -n "$PKG_CONFIG" && \
  15      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
  16 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
  17 +  ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED") 2>&5
  18    ac_status=$?
  19    printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  20    test $ac_status = 0; }; then
  21 -  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
  22 +  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
  23                       test "x$?" != "x0" && pkg_failed=yes
  24  else
  25    pkg_failed=yes
  26 @@ -13615,11 +13615,11 @@ if test -n "$GLIB_LIBS"; then
  27   elif test -n "$PKG_CONFIG"; then
  28      if test -n "$PKG_CONFIG" && \
  29      { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
  30 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
  31 +  ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED") 2>&5
  32    ac_status=$?
  33    printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  34    test $ac_status = 0; }; then
  35 -  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
  36 +  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
  37                       test "x$?" != "x0" && pkg_failed=yes
  38  else
  39    pkg_failed=yes
  40 @@ -13640,9 +13640,9 @@ else
  41          _pkg_short_errors_supported=no
  42  fi
  43          if test $_pkg_short_errors_supported = yes; then
  44 -               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
  45 +               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 2>&1`
  46          else
  47 -               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
  48 +               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 >= $GLIB_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 2>&1`
  49          fi
  50         # Put the nasty error message in config.log where it belongs
  51         echo "$GLIB_PKG_ERRORS" >&5
  52 --- a/gobject-introspection/Makefile.in
  53 +++ b/gobject-introspection/Makefile.in
  54 @@ -383,8 +383,8 @@ libgidl_la_SOURCES = \
  55         $(NULL)
  56
  57  libgidl_la_LIBADD = \
  58 -       $(GLIB_LIBS) \
  59         $(GMODULE_LIBS) \
  60 +       $(GLIB_LIBS) \
  61         $(NULL)
  62
  63  BUILT_SOURCES = scannerparser.h
  64 @@ -400,8 +400,8 @@ gen_introspect_SOURCES = \
  65         $(NULL)
  66
  67  gen_introspect_LDADD = \
  68 -       $(GLIB_LIBS) \
  69         $(GMODULE_LIBS) \
  70 +       $(GLIB_LIBS) \
  71         libgidl.la \
  72         $(NULL)
  73