changeset 3474:ff86d732573a

Update libtool for libgphoto2 too.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Fri, 11 May 2007 18:13:33 +0200
parents 991da4c30d99
children 4daaa9c73991
files gub/specs/libgphoto2.py
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/libgphoto2.py	Fri May 11 18:08:21 2007 +0200
+++ b/gub/specs/libgphoto2.py	Fri May 11 18:13:33 2007 +0200
@@ -8,6 +8,8 @@
 # -lltdl build problem
 #        self.with (version='2.3.0', mirror=sf_gphoto)
         self.with (version='2.3.1', mirror=sf_gphoto)
+    def get_build_dependencies (self):
+        return ['libexif', 'libjpeg', 'libusb']
     def wrap_pkg_config (self):
         self.dump ('''#! /bin/sh
 /usr/bin/pkg-config\
@@ -34,8 +36,10 @@
     def configure_command (self):
         return ('PATH=%(srcdir)s:$PATH '
                 + targetpackage.TargetBuildSpec.configure_command (self))
-    def get_build_dependencies (self):
-        return ['libexif', 'libjpeg', 'libusb']
+    def configure (self):
+        targetpackage.TargetBuildSpec.configure (self)
+        # # FIXME: libtool too old for cross compile
+        self.update_libtool ()
     def makeflags (self):
-        return """ libgphoto2_port_la_DEPENDENCIES='$(top_srcdir)/gphoto2/gphoto2-port-version.h $(top_srcdir)/gphoto2/gphoto2-port-library.h $(srcdir)/libgphoto2_port.sym' libgphoto2_la_DEPENDENCIES='$(top_srcdir)/gphoto2/gphoto2-version.h $(srcdir)/libgphoto2.sym'"""
+        return """ libgphoto2_port_la_DEPENDENCIES='$(top_srcdir)/gphoto2/gphoto2-port-version.h $(top_srcdir)/gphoto2/gphoto2-port-library.h $(srcdir)/libgphoto2_port.sym' libgphoto2_la_DEPENDENCIES='$(top_srcdir)/gphoto2/gphoto2-version.h $(srcdir)/libgphoto2.sym' LDFLAGS='-Wl,--rpath-link,%(system_root)s/usr/lib'"""