summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-05-08 16:07:22 +0000
committerhans <hans@pkgsrc.org>2012-05-08 16:07:22 +0000
commit486e909bd4d733b9cf435a6149b9d4b5fa60a1bb (patch)
tree049d87b5d461ba2d34f82043a4ab91f2a016d9b2 /devel/glib2
parent2f6870f12ee176e7d77370335249e76b5188fab4 (diff)
downloadpkgsrc-486e909bd4d733b9cf435a6149b9d4b5fa60a1bb.tar.gz
Fix build on SunOS.
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/Makefile5
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-glib_tests_include.c17
3 files changed, 22 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 31e978c7678..5994e3498f3 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202 2012/05/04 10:22:08 obache Exp $
+# $NetBSD: Makefile,v 1.203 2012/05/08 16:07:22 hans Exp $
.include "Makefile.common"
.include "options.mk"
@@ -40,7 +40,8 @@ CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -
# needs gz_header structure
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
-LIBS.SunOS+= -lnsl -lsocket
+LIBS.SunOS+= -lnsl -lsocket
+CPPFLAGS.SunOS+= -DBSD_COMP
.if ${OBJECT_FMT} == "ELF"
.include "../../devel/libelf/buildlink3.mk"
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index e50f3ac6a8c..e0e608563c0 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.171 2012/05/04 10:22:08 obache Exp $
+$NetBSD: distinfo,v 1.172 2012/05/08 16:07:23 hans Exp $
SHA1 (glib-2.32.2.tar.xz) = 5898165e58c8f946c2b1fd05b910fe4476b64164
RMD160 (glib-2.32.2.tar.xz) = 2ec828c54c31f07d9d28d182f1d6e8398e112928
@@ -35,3 +35,4 @@ SHA1 (patch-cl) = de1d916aa9137aea278a223990fbde5b2ab9feb9
SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f
SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
+SHA1 (patch-glib_tests_include.c) = 95f7d34e6e03849316bbfac1541eec4582b92ffc
diff --git a/devel/glib2/patches/patch-glib_tests_include.c b/devel/glib2/patches/patch-glib_tests_include.c
new file mode 100644
index 00000000000..4c13836dc7e
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_tests_include.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-glib_tests_include.c,v 1.1 2012/05/08 16:07:23 hans Exp $
+
+SunOS requires _XOPEN_SOURCE etc. to be set correctly when compiling C99.
+
+--- glib/tests/include.c.orig 2012-04-13 01:39:20.000000000 +0200
++++ glib/tests/include.c 2012-05-08 15:05:36.027464330 +0200
+@@ -1,8 +1,10 @@
+ /* Test case for bug 659866 */
+
++#ifndef __sun
+ #define _POSIX_C_SOURCE 199309L
+ #undef _GNU_SOURCE
+ #undef _XOPEN_SOURCE
++#endif
+ #include <pthread.h>
+ #include <glib.h>
+