From caeea08a93bf5b877a23d6e376b610fcf460519d Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Sun, 1 Feb 2004 07:20:04 +0000
Subject: [PATCH] For reasons totally unclear to me, hppa segfaults with the
 included glib code but not when statically linked with the in-tree glib.

So, on hppa, solve this by statically linking to the in-tree glib.
---
 devel/pkgconfig/Makefile                   |  9 +++++++-
 devel/pkgconfig/patches/sup-hppa-configure | 26 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 devel/pkgconfig/patches/sup-hppa-configure

diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 0a331d4f9d3..10ea692c22e 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2003/09/23 05:59:34 marcm Exp $
+# $OpenBSD: Makefile,v 1.14 2004/02/01 07:20:04 marcm Exp $
 
 COMMENT=		"tool for managing library compile/link flags"
 
@@ -18,6 +18,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+# hppa's segfault with the included glib, so for them we'll
+# statically link with devel/glib.
+.if (${MACHINE_ARCH} == "hppa")
+PATCH_LIST=     patch-* sup-hppa-*
+BUILD_DEPENDS=	:glib-*:devel/glib
+.endif
+
 CONFIGURE_STYLE=	gnu
 
 .include <bsd.port.mk>
diff --git a/devel/pkgconfig/patches/sup-hppa-configure b/devel/pkgconfig/patches/sup-hppa-configure
new file mode 100644
index 00000000000..4ee1a81b9b9
--- /dev/null
+++ b/devel/pkgconfig/patches/sup-hppa-configure
@@ -0,0 +1,26 @@
+$OpenBSD: sup-hppa-configure,v 1.1 2004/02/01 07:20:04 marcm Exp $
+--- configure.orig	2003-01-16 13:09:17.000000000 -0800
++++ configure	2004-01-31 21:08:10.000000000 -0800
+@@ -5525,7 +5525,10 @@ EOF
+ esac
+ echo "$ac_t""$native_win32" 1>&6
+ 
+-
++native_win32=yes
++cat >> confdefs.h <<\EOF
++#define USE_INSTALLED_GLIB 1
++EOF
+ 
+ if test x$native_win32 = xyes; then
+   USE_INSTALLED_GLIB_TRUE=
+@@ -5543,8 +5546,8 @@ if test x$native_win32 = xyes; then
+   # mechanism). Others use prebuilt versions.
+   #
+   # These are correct for GLib 2.x
+-  GLIB_CFLAGS="-I$includedir/glib-2.0 -I$libdir/glib-2.0/include"
+-  GLIB_LIBS="-L$libdir -lglib-2.0 -liconv -lintl"
++  GLIB_CFLAGS="-I$includedir/glib-1.2"
++  GLIB_LIBS="$libdir/libglib.a"
+ 
+   
+