Mercurial > mxe-octave

changeset 1155:8fb557920a4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfixes for packages: cairomm glibmm gtkmm libsigc++ pangomm
author Tony Theodore <tonyt@logyst.com>
date Sat, 18 Sep 2010 21:37:49 +0200
parents a8f4b5284190
children ac757c905910
files src/cairomm.mk src/glibmm.mk src/gtkmm.mk src/libsigc++.mk src/pangomm.mk
diffstat 5 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/cairomm.mk	Sat Sep 18 21:35:42 2010 +0200
+++ b/src/cairomm.mk	Sat Sep 18 21:37:49 2010 +0200
@@ -23,6 +23,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        --prefix='$(PREFIX)/$(TARGET)' \
+	     MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
\ No newline at end of file
--- a/src/glibmm.mk	Sat Sep 18 21:35:42 2010 +0200
+++ b/src/glibmm.mk	Sat Sep 18 21:37:49 2010 +0200
@@ -3,7 +3,7 @@
 
 # GLibmm
 PKG             := glibmm
-$(PKG)_IGNORE   :
+$(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.24.2
 $(PKG)_CHECKSUM := df5f22d2c40ebdf097ecdb4a7dfeef70d1ca24e7
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
@@ -29,7 +29,8 @@
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
-        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+	     MAKE=$(MAKE)
     $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF=
     $(MAKE) -C '$(1)'         -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/gtkmm.mk	Sat Sep 18 21:35:42 2010 +0200
+++ b/src/gtkmm.mk	Sat Sep 18 21:37:49 2010 +0200
@@ -26,6 +26,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        --prefix='$(PREFIX)/$(TARGET)' \
+	     MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/libsigc++.mk	Sat Sep 18 21:35:42 2010 +0200
+++ b/src/libsigc++.mk	Sat Sep 18 21:37:49 2010 +0200
@@ -3,7 +3,7 @@
 
 # libsigc++
 PKG             := libsigc++
-$(PKG)_IGNORE   :
+$(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.2.8
 $(PKG)_CHECKSUM := c26f57110629c16c0b5a873346b7c1cf0edc9c5e
 $(PKG)_SUBDIR   := libsigc++-$($(PKG)_VERSION)
@@ -29,6 +29,7 @@
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
-        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+	     MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/pangomm.mk	Sat Sep 18 21:35:42 2010 +0200
+++ b/src/pangomm.mk	Sat Sep 18 21:37:49 2010 +0200
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := pangomm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.pango.org/
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pangomm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := pango
+$(PKG)_DEPS     := cairomm glibmm pango
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.gnome.org/browse/pangomm/refs/tags' | \
@@ -25,6 +25,7 @@
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        --prefix='$(PREFIX)/$(TARGET)' \
+	     MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef