# HG changeset patch
# User Jan Nieuwenhuizen <janneke@gnu.org>
# Date 1178898283 -7200
# Node ID 38373ff3216ce90bf5c1ea32affb40b0b5890e90
# Parent  5230459a62f1edf8acad35bc4e74fbeab091ffd4
Libgphoto2 build fix.

diff -r 5230459a62f1 -r 38373ff3216c TODO
--- a/TODO	Fri May 11 17:14:49 2007 +0200
+++ b/TODO	Fri May 11 17:44:43 2007 +0200
@@ -22,7 +22,10 @@
 
 * move autotools patching to autogen/prepare_configure stage.
 
-* move makeflags () feature to buildspec.
+* fix all instances of makeflags () and compile/install
+
+* move wrap_pkg_config from libgphoto2 to target/build spec (note
+  configure: PATH setting?)
 
 * Bootstrap whole toolchain from source on more platforms (freebsd)?
 
diff -r 5230459a62f1 -r 38373ff3216c gub/specs/libgphoto2.py
--- a/gub/specs/libgphoto2.py	Fri May 11 17:14:49 2007 +0200
+++ b/gub/specs/libgphoto2.py	Fri May 11 17:44:43 2007 +0200
@@ -6,6 +6,22 @@
     def __init__ (self, settings):
         targetpackage.TargetBuildSpec.__init__ (self, settings)
         self.with (version='2.1.6', mirror=sf_gphoto)
+    def wrap_pkg_config (self):
+        self.dump ('''#! /bin/sh
+/usr/bin/pkg-config\
+  --define-variable prefix=%(system_root)s/usr\
+  --define-variable includedir=%(system_root)s/usr/include\
+  --define-variable libdir=%(system_root)s/usr/lib\
+"$@"
+''',
+                   '%(srcdir)s/pkg-config')
+        import os
+        os.chmod (self.expand ('%(srcdir)s/pkg-config'), 0755)
+    def patch (self):
+        self.wrap_pkg_config ()
+    def configure_command (self):
+        return ('PATH=%(srcdir)s:$PATH '
+                + targetpackage.TargetBuildSpec.configure_command (self))
     def get_build_dependencies (self):
         return ['libexif', 'libjpeg', 'libusb']