Mercurial > gub

changeset 3549:22c153d2f44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 30 May 2007 14:03:34 +0200
parents 8c09f7134032 (current diff) 712618d22ccd (diff)
children 0e1e98a5b4a5
files
diffstat 5 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/compilers.make	Wed May 30 14:00:52 2007 +0200
+++ b/compilers.make	Wed May 30 14:03:34 2007 +0200
@@ -82,7 +82,7 @@
 	$(GUB) $(LOCAL_GUB_OPTIONS) -p local git
 
 local-cross-tools:
-ifneq ($(filter mingw,$(PLATFORMS)),)
+ifeq ($(findstring mingw, $(PLATFORMS)),mingw)
 ifneq ($(BUILD_PLATFORM),linux-64)
 	$(GUB) $(LOCAL_GUB_OPTIONS) -p local nsis 
 endif
--- a/gub/specs/libexif.py	Wed May 30 14:00:52 2007 +0200
+++ b/gub/specs/libexif.py	Wed May 30 14:03:34 2007 +0200
@@ -8,4 +8,6 @@
 #        self.with_template (version="0.6.9", mirror=mirrors.sf)
 # does not install
 #        self.with_template (version="0.6.14", mirror=mirrors.sf)
-        self.with_template (version="0.6.12", mirror=mirrors.sf)
+# too old for libgphoto-2.3.1
+#        self.with_template (version="0.6.12", mirror=mirrors.sf)
+        self.with_template (version="0.6.15", mirror=mirrors.sf)
--- a/gub/specs/libgphoto2.py	Wed May 30 14:00:52 2007 +0200
+++ b/gub/specs/libgphoto2.py	Wed May 30 14:03:34 2007 +0200
@@ -7,7 +7,10 @@
         targetpackage.TargetBuildSpec.__init__ (self, settings)
 # -lltdl build problem
 #        self.with_template (version='2.3.0', mirror=sf_gphoto)
+# needs libexif >= 0.6.13, which we currently cannot compile/install
         self.with_template (version='2.3.1', mirror=sf_gphoto)
+# Does not compile
+#        self.with_template (version='2.1.6', mirror=sf_gphoto)
     def get_build_dependencies (self):
         return ['libexif', 'libjpeg', 'libusb']
     def wrap_pkg_config (self):
--- a/gub/specs/xerces-c.py	Wed May 30 14:00:52 2007 +0200
+++ b/gub/specs/xerces-c.py	Wed May 30 14:03:34 2007 +0200
@@ -15,6 +15,7 @@
             'THREADS': 'pthread',
             'BITSTOBUILD': '32',
             'LIBS': ' -lpthread ',
+            'ALLLIBS': "${LIBS}",
             'CFLAGS': ' -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET ',
             'CXXFLAGS': ' -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET ',
             }
--- a/mingit.make	Wed May 30 14:00:52 2007 +0200
+++ b/mingit.make	Wed May 30 14:03:34 2007 +0200
@@ -8,11 +8,11 @@
 
 default: all
 
+PLATFORMS = mingw
+
 include gub.make
 include compilers.make
 
-PLATFORMS = mingw
-
 GPKG_OPTIONS=--branch git=$(MINGIT_LOCAL_BRANCH)
 
 GUB_OPTIONS=\