diff options
| author | obache <obache@pkgsrc.org> | 2012-05-04 10:22:08 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-05-04 10:22:08 +0000 |
| commit | de2842900aef6efbab1e3c6bbced3ec4a2fdf806 (patch) | |
| tree | fbdc59b62835706b30ad2416001587ab2edea3ff /devel/glib2/patches | |
| parent | 41c395a91071965d67745a7c603c685640ab8f65 (diff) | |
| download | pkgsrc-de2842900aef6efbab1e3c6bbced3ec4a2fdf806.tar.gz | |
* Update PKGCONFIG_OVERRIDE list to reflect reality.
* Restore pthread flag settings in configure script.
It still in the last hunk of patch-ak (for configure.ac),
but lost at updated to 2.32.1.
* Fixes missing pthread linkage of libglib-2.0 on OpenBSD.
Bump PKGREVISION.
Diffstat (limited to 'devel/glib2/patches')
| -rw-r--r-- | devel/glib2/patches/patch-aa | 14 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ak | 10 |
2 files changed, 21 insertions, 3 deletions
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 2e53818466c..4f5e906e62d 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $ +$NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $ --- configure.orig 2012-05-01 00:10:54.000000000 +0000 +++ configure @@ -176,7 +176,7 @@ $NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5 $as_echo_n "checking for gspawn implementation... " >&6; } case "$host" in -@@ -26401,62 +26487,6 @@ if test x"$have_threads" = xposix; then +@@ -26401,62 +26487,8 @@ if test x"$have_threads" = xposix; then G_THREAD_LIBS="-lpthread -lthread" ;; *) @@ -236,6 +236,16 @@ $NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $ - break; - fi - done ++ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ;; esac fi +@@ -26954,6 +26986,7 @@ case $host in + ;; + *-*-openbsd*) + LDFLAGS="$LDFLAGS -pthread" ++ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" + ;; + *) + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak index 8294029a977..9c109bd57cb 100644 --- a/devel/glib2/patches/patch-ak +++ b/devel/glib2/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.11 2012/05/01 18:45:52 adam Exp $ +$NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $ --- configure.ac.orig 2012-05-01 00:06:39.000000000 +0000 +++ configure.ac @@ -145,3 +145,11 @@ $NetBSD: patch-ak,v 1.11 2012/05/01 18:45:52 adam Exp $ ;; esac fi +@@ -2301,6 +2334,7 @@ case $host in + ;; + *-*-openbsd*) + LDFLAGS="$LDFLAGS -pthread" ++ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" + ;; + *) + G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" |