From ee3456c369a600c3f734ba87e510bed1c26e55a8 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Sun, 8 Mar 2009 14:41:47 +0100
Subject: [PATCH] portability fix for MacOS X in package glib: set CXX
 explicitly

For some strange reason, glib's configure script initializes
CXX with "c++" instead of the cross C++ compiler. This usually
does no harm, because glib doesn't use the C++ compiler. However,
it poisons libtool's compiler lib search paths. This also usually
does no harm, except on MacOS X where it causes libtool to link
against /usr/lib/libiconv.dylib, which makes the cross build fail.
---
 src/glib.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/glib.mk b/src/glib.mk
index 0f19bf6a..f026638f 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -53,6 +53,7 @@ define $(PKG)_BUILD
         --with-threads=win32 \
         --with-pcre=system \
         --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=
 endef