[oe-commits] org.oe.oz354x glib-1.2_1.2.10.bb : import patch from .dev to fix pkgconfig usage.

[xora commit]

glib-1.2_1.2.10.bb : import patch from .dev to fix pkgconfig usage.

Author: xora at openembedded.org
Branch: org.openembedded.oz354x
Revision: 8f08a719fc19fa75ed64011d972c07e7a84a8387
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8f08a719fc19fa75ed64011d972c07e7a84a8387
Files:
1
packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config
Diffs:

#
# mt diff -r2ba9a32f905f21a4154c47c7a2bcd10af656b138 -r8f08a719fc19fa75ed64011d972c07e7a84a8387
#
# 
# 
# patch "packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config"
#  from [9a293228ea866ca01a0494b4aa91676afdfb445a]
#    to [7f0060d7aebb5fc864b677958fef4c2e1d967116]
# 
============================================================
--- packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config	9a293228ea866ca01a0494b4aa91676afdfb445a
+++ packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config	7f0060d7aebb5fc864b677958fef4c2e1d967116
@@ -1,11 +1,5 @@
-patch glib-config so it indirects to pkgconfig for cflags and libs
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- glib-1.2.10/glib-config.in~glib-config-use-pkg-config
-+++ glib-1.2.10/glib-config.in
+--- glib-1.2.10/glib-config.in.orig	2006-06-28 12:28:53.000000000 +0100
++++ glib-1.2.10/glib-config.in	2006-06-28 12:31:33.000000000 +0100
 @@ -28,6 +28,8 @@
  
  lib_glib=yes
@@ -15,7 +9,7 @@ patch glib-config so it indirects to pkg
  while test $# -gt 0; do
    case "$1" in
    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-@@ -55,20 +57,9 @@
+@@ -55,20 +57,14 @@
        echo @GLIB_VERSION@
        exit 0
        ;;
@@ -33,13 +27,18 @@ patch glib-config so it indirects to pkg
 -      ;;
 -    gthread)
 -      lib_gthread=yes
-+    --cflags | --libs | glib | gmodule | gthread)
++    --cflags | --libs)
 +      cmd="$cmd $1 "
 +      echo_pkgconfig="yes"
++      ;;
++    glib | gmodule | gthread)
++      cmd="$cmd $1 "
++      echo_pkgconfig="yes"
++      module_provided="yes"
        ;;
      *)
        usage 1 1>&2
-@@ -83,26 +74,6 @@
+@@ -83,26 +79,9 @@
  if test "$echo_exec_prefix" = "yes"; then
  	echo $exec_prefix
  fi
@@ -66,5 +65,8 @@ patch glib-config so it indirects to pkg
 -	fi
 -	echo -L at libdir@ $libsp $libsa
 +if test "$echo_pkgconfig" = "yes"; then
++        if test -z "$module_provided" ; then
++                cmd="$cmd glib"
++        fi
 +	echo `$cmd`
  fi