summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwilliam3 <r.3@libertysurf.fr>2013-08-05 20:45:20 (GMT)
committerwilliam3 <r.3@libertysurf.fr>2013-08-05 21:20:32 (GMT)
commit21e8f4ffcd8ed66f4cd58c10693b321930b51891 (patch)
tree9d2209b1563e3c1ba6a590e2375effa604e61d4c
parenta8d1ba94e68b478b238db87c232f4633a2a75554 (diff)
downloadmxe-21e8f4ffcd8ed66f4cd58c10693b321930b51891.zip
mxe-21e8f4ffcd8ed66f4cd58c10693b321930b51891.tar.gz
mxe-21e8f4ffcd8ed66f4cd58c10693b321930b51891.tar.bz2
libglade : comment installation of missing dll file that breaks make install
-rw-r--r--src/libglade-1-fixes.patch32
-rw-r--r--src/libglade.mk3
2 files changed, 34 insertions, 1 deletions
diff --git a/src/libglade-1-fixes.patch b/src/libglade-1-fixes.patch
new file mode 100644
index 0000000..52cd435
--- /dev/null
+++ b/src/libglade-1-fixes.patch
@@ -0,0 +1,32 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 01e3cf1fae96edc0b5e8ccd0bf2c2ea11d0a6987 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 4 Aug 2013 23:32:15 +0200
+Subject: [PATCH] comment out production of some file for make install to
+ succeed
+
+
+diff --git a/glade/Makefile.am b/glade/Makefile.am
+index f6271f7..fae55bc 100644
+--- a/glade/Makefile.am
++++ b/glade/Makefile.am
+@@ -13,10 +13,10 @@ if OS_WIN32
+ export_symbols = -export-symbols glade.def
+
+ install-libtool-import-lib:
+- $(INSTALL) .libs/libglade-2.0.dll.a $(DESTDIR)$(libdir)
++# $(INSTALL) .libs/libglade-2.0.dll.a $(DESTDIR)$(libdir)
+
+ uninstall-libtool-import-lib:
+- -rm $(DESTDIR)$(libdir)/libglade-2.0.dll.a
++# -rm $(DESTDIR)$(libdir)/libglade-2.0.dll.a
+ else
+
+ export_symbols = -export-symbols-regex "^[^_].*"
+--
+1.8.1.2
+
diff --git a/src/libglade.mk b/src/libglade.mk
index 4f95d7d..6a6376a 100644
--- a/src/libglade.mk
+++ b/src/libglade.mk
@@ -17,6 +17,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
+ cd '$(1)' && autoreconf -fi
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--build="`config.guess`" \
@@ -24,5 +25,5 @@ define $(PKG)_BUILD
--prefix='$(PREFIX)/$(TARGET)' \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)'
- $(MAKE) -C '$(1)' -j 1 install-exec
+ $(MAKE) -C '$(1)' -j 1 install
endef