Mercurial > mxe-octave

changeset 288:9d06f168f339

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portability fix for FreeBSD in package glib: don't expect the build system to have libiconv installed
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 07 Mar 2009 22:20:07 +0100
parents 92ac81dea92d
children 80db16b25659
files src/glib.mk
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/glib.mk	Sat Mar 07 21:59:35 2009 +0100
+++ b/src/glib.mk	Sat Mar 07 22:20:07 2009 +0100
@@ -16,6 +16,14 @@
 endef
 
 define $(PKG)_BUILD
+    # native build of libiconv (used by glib-genmarshal)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,libiconv)
+    cd '$(1)/$(libiconv_SUBDIR)' && ./configure \
+        --prefix='$(1)/libiconv' \
+        --disable-shared \
+        --disable-nls
+    $(MAKE) -C '$(1)/$(libiconv_SUBDIR)' -j 1 install
+
     # native build for glib-genmarshal, without pkg-config and gettext
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib)
     $(SED) 's,^PKG_CONFIG=.*,PKG_CONFIG=echo,' -i '$(1)/$(glib_SUBDIR)/configure'
@@ -28,7 +36,10 @@
         --without-threads \
         --disable-selinux \
         --disable-fam \
-        --disable-xattr
+        --disable-xattr \
+        --with-libiconv=gnu \
+        CPPFLAGS='-I$(1)/libiconv/include' \
+        LDFLAGS='-L$(1)/libiconv/lib'
     $(SED) 's,#define G_ATOMIC.*,,' -i '$(1)/$(glib_SUBDIR)/config.h'
     $(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)'
     $(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
@@ -41,6 +52,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-threads=win32 \
         --with-pcre=system \
+        --with-libiconv=gnu \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef