merge

2010-02-07 16:36:36 +01:00 · 2010-02-07 16:36:36 +01:00 · e52d60183a
parent 7736ddb896 6b78083d3a
commit e52d60183a
5 changed files with 52 additions and 49 deletions
--- a/src/gettext.mk
+++ b/src/gettext.mk
@ -20,46 +20,6 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    # native build of libiconv (used by gettext-tools)
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,libiconv)
-    cd '$(1)/$(libiconv_SUBDIR)' && ./configure \
-        --prefix='$(1)/libiconv' \
-        --disable-shared \
-        --disable-java \
-        --disable-csharp \
-        --disable-nls
-    $(MAKE) -C '$(1)/$(libiconv_SUBDIR)' -j 1 install
-
-    # bugfix for gettext
-    # This problem will be solved in gettext >= 1.8. See:
-    # http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=ecad95f51a11409cc0d30b22913a8ba77d3edf1d
-    $(SED) 's/O_CREAT);/O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);/' \
-        -i '$(1)/gettext-tools/src/write-catalog.c'
-
-    # native build for gettext-tools
-    cd '$(1)/gettext-tools' && ./configure \
-        --disable-shared \
-        --prefix='$(PREFIX)' \
-        --disable-java \
-        --disable-csharp \
-        --disable-threads \
-        --with-libiconv-prefix='$(1)/libiconv' \
-        --with-included-gettext \
-        --with-included-glib \
-        --with-included-libcroco \
-        --with-included-libxml \
-        --with-included-regex \
-        --without-libpth-prefix \
-        --without-libncurses-prefix \
-        --without-libtermcap-prefix \
-        --without-libxcurses-prefix \
-        --without-libcurses-prefix \
-        --without-libexpat-prefix \
-        --without-emacs
-    $(MAKE) -C '$(1)/gettext-tools' -j '$(JOBS)' SHELL=bash
-    $(MAKE) -C '$(1)/gettext-tools/src' -j 1 SHELL=bash lib_LTLIBRARIES= install-binPROGRAMS
-
-    # cross build for gettext-runtime
    cd '$(1)/gettext-runtime' && ./configure \
        --host='$(TARGET)' \
        --disable-shared \
--- a/src/glib-win32.patch
+++ b/src/glib-win32.patch
@ -0,0 +1,27 @@
+This file is part of mingw-cross-env.
+See doc/index.html or doc/README for further information.
+
+diff -ru glib-2.23.2.orig/configure.in glib-2.23.2/configure.in
+--- glib-2.23.2.orig/configure.in	2010-01-25 02:50:02.000000000 +0100
+++ glib-2.23.2/configure.in	2010-02-07 14:29:02.000000000 +0100
+@@ -2735,8 +2735,6 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-GTK_DOC_CHECK([1.11])
+-
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
+                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+diff -ru glib-2.23.2.orig/m4macros/glib-gettext.m4 glib-2.23.2/m4macros/glib-gettext.m4
+--- glib-2.23.2.orig/m4macros/glib-gettext.m4	2009-04-01 01:04:20.000000000 +0200
+++ glib-2.23.2/m4macros/glib-gettext.m4	2010-02-07 15:37:34.000000000 +0100
+@@ -246,8 +246,6 @@
+ 	    esac])
+           LIBS="$glib_save_LIBS"
+ 	  INSTOBJEXT=.mo
+-	else
+-	  gt_cv_have_gettext=no
+ 	fi
+       fi
+     ])
--- a/src/glib.mk
+++ b/src/glib.mk
@ -53,6 +53,9 @@ define $(PKG)_BUILD
    $(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec

    # cross build
+    cd '$(1)' && aclocal
+    cd '$(1)' && $(LIBTOOLIZE) --force
+    cd '$(1)' && autoconf
    $(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
    # wine confuses the cross-compiling detection, so set it explicitly
    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
@ -65,5 +68,9 @@ define $(PKG)_BUILD
        --with-libiconv=gnu \
        CXX='$(TARGET)-c++' \
        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/glib'    -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/gio'     -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/libgsf-win32.patch
+++ b/src/libgsf-win32.patch
@ -0,0 +1,15 @@
+This file is part of mingw-cross-env.
+See doc/index.html or doc/README for further information.
+
+diff -ru libgsf-1.14.16.orig/configure.in libgsf-1.14.16/configure.in
+--- libgsf-1.14.16.orig/configure.in	2009-09-26 01:19:36.000000000 +0200
+++ libgsf-1.14.16/configure.in	2010-02-07 16:21:58.000000000 +0100
+@@ -51,8 +51,6 @@
+ 
+ dnl Gettext/i18n stuff
+ 
+-IT_PROG_INTLTOOL([0.35.0])
+-
+ AM_GLIB_GNU_GETTEXT
+ 
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
--- a/src/libgsf.mk
+++ b/src/libgsf.mk
@ -20,13 +20,7 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    # Don't search for intltool
-    $(SED) 's,\(INTLTOOL_APPLIED_VERSION\)=.*,\1=0.35.0,' -i '$(1)/configure'
-    $(SED) 's,^\(INTLTOOL_UPDATE\)=.*,\1=disabled,' -i '$(1)/configure'
-    $(SED) 's,^\(INTLTOOL_MERGE\)=.*,\1=disabled,' -i '$(1)/configure'
-    $(SED) 's,^\(INTLTOOL_EXTRACT\)=.*,\1=disabled,' -i '$(1)/configure'
-    $(SED) 's,require XML::Parser,,' -i '$(1)/configure'
-    # build
+    cd '$(1)' && autoconf
    cd '$(1)' && ./configure \
        --host='$(TARGET)' \
        --disable-shared \
@ -41,5 +35,5 @@ define $(PKG)_BUILD
        --with-bz2 \
        --with-gio \
        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)/gsf' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef