From fab6f7f5539365614dc222fb894a8af6beb91e51 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Sun, 7 Feb 2010 10:00:58 +0100
Subject: use the natively installed pkg-config instead of building a custom
 pkg-config

---
 doc/index.html    | 20 ++++++++++++++------
 src/gcc.mk        |  6 ++++++
 src/pkg_config.mk | 28 ----------------------------
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 src/pkg_config.mk

diff --git a/doc/index.html b/doc/index.html
index e46424c..b0158cb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -544,6 +544,11 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td></td>
     </tr>
     <tr>
+        <td><a href="http://pkg-config.freedesktop.org/">Pkg-config</a></td>
+        <td>≥ 0.16</td>
+        <td></td>
+    </tr>
+    <tr>
         <td><a href="http://www.scons.org/">SCons</a></td>
         <td>≥ 0.98</td>
     </tr>
@@ -567,7 +572,8 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     <!-- http://www.debian.org/distrib/packages#search_packages -->
     <pre>aptitude install -R autoconf automake bash bison bzip2 \
                     cmake flex g++ make sed libtool \
-                    openssl patch perl scons unzip wget</pre>
+                    openssl patch perl pkg-config scons \
+                    unzip wget</pre>
 
     <p>
     On 64-bit Debian, install also:
@@ -578,7 +584,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <!-- http://www.freebsd.org/ports/ -->
     <pre>pkg_add -r autoconf automake bash bison cmake flex gmake \
-           gsed libtool perl scons unzip wget</pre>
+           gsed libtool perl pkg-config scons unzip wget</pre>
 
     <p>
     On 64-bit FreeBSD,
@@ -590,7 +596,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     <!-- http://www.frugalware.org/packages -->
     <pre>pacman-g2 -S autoconf automake bash bzip2 bison cmake \
              flex gcc make sed libtool openssl patch perl \
-             scons unzip wget</pre>
+             pkgconfig scons unzip wget</pre>
 
     <p>
     On 64-bit Frugalware,
@@ -608,7 +614,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     </p>
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
-                  gmake gsed libtool scons wget</pre>
+                  gmake gsed libtool pkgconfig scons wget</pre>
 
     <h3>MacOS 10.6</h3>
 
@@ -621,7 +627,8 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     </p>
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
-                  gmake gsed libtool scons wget gcc_select
+                  gmake gsed libtool pkgconfig scons wget \
+                  gcc_select
 sudo gcc_select gcc40</pre>
 
     <h3>Open Solaris 2009.06</h3>
@@ -643,7 +650,8 @@ sudo gcc_select gcc40</pre>
     <pre>pfexec pkg install SUNWaconf SUNWgnu-automake-110 \
                    SUNWbison SUNWcmake SUNWflexlex SUNWgcc \
                    SUNWgmake SUNWgsed SUNWlibtool SUNWgzip \
-                   SUNWlibm SUNWgpch SUNWunzip SUNWwget</pre>
+                   SUNWlibm SUNWgpch SUNWgnome-common-devel \
+                   SUNWunzip SUNWwget</pre>
 
     <p>
     Then download and install SCons by hand:
diff --git a/src/gcc.mk b/src/gcc.mk
index 77cbd13..882b475 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -77,4 +77,10 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         LIBS='-lws2_32'
     $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install
+
+    # create pkg-config script
+    (echo '#!/bin/sh'; \
+     echo 'PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config "$$@"') \
+             > '$(PREFIX)/bin/$(TARGET)-pkg-config'
+    chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config'
 endef
diff --git a/src/pkg_config.mk b/src/pkg_config.mk
deleted file mode 100644
index 31f5f92..0000000
--- a/src/pkg_config.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html or doc/README for further information.
-
-# pkg-config
-PKG             := pkg_config
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.23
-$(PKG)_CHECKSUM := b59dddd6b5320bd74c0f74b3339618a327096b2a
-$(PKG)_SUBDIR   := pkg-config-$($(PKG)_VERSION)
-$(PKG)_FILE     := pkg-config-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://pkg-config.freedesktop.org/
-$(PKG)_URL      := http://pkgconfig.freedesktop.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://pkgconfig.freedesktop.org/' | \
-    $(SED) -n 's,.*current release of pkg-config is version \([0-9][^ ]*\) and.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
-    $(INSTALL) -d                       '$(PREFIX)/bin'
-    rm -f                               '$(PREFIX)/bin/$(TARGET)-pkg-config'
-    ln -s '../$(TARGET)/bin/pkg-config' '$(PREFIX)/bin/$(TARGET)-pkg-config'
-endef
-- 
cgit v0.12