Tue May 8 16:07:23 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.202 -r1.203 pkgsrc/devel/glib2/Makefile
diff -r1.171 -r1.172 pkgsrc/devel/glib2/distinfo
diff -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-glib_tests_include.c
cvs diff -r1.202 -r1.203 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2012/05/04 10:22:08 1.202
+++ pkgsrc/devel/glib2/Makefile 2012/05/08 16:07:22 1.203
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.202 2012/05/04 10:22:08 obache Exp $ 1# $NetBSD: Makefile,v 1.203 2012/05/08 16:07:22 hans Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4.include "options.mk" 4.include "options.mk"
5 5
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= devel 7CATEGORIES= devel
8 8
9COMMENT= Some useful routines for C programming (glib2) 9COMMENT= Some useful routines for C programming (glib2)
10 10
11USE_TOOLS+= msgfmt perl:run 11USE_TOOLS+= msgfmt perl:run
12 12
13PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 13PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
14PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 14PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
@@ -30,25 +30,26 @@ FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX @@ -30,25 +30,26 @@ FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX
30# in a broken and useless state. 30# in a broken and useless state.
31CHECK_INTERPRETER_SKIP+= bin/gtester-report 31CHECK_INTERPRETER_SKIP+= bin/gtester-report
32CHECK_INTERPRETER_SKIP+= bin/gdbus-codegen 32CHECK_INTERPRETER_SKIP+= bin/gdbus-codegen
33 33
34# need pcre utf8 + unicode-properties 34# need pcre utf8 + unicode-properties
35BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11 35BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11
36# to avoid pkg-config dependency, explicitly specify pcre location 36# to avoid pkg-config dependency, explicitly specify pcre location
37CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include 37CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
38CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre" 38CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
39 39
40# needs gz_header structure 40# needs gz_header structure
41BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1 41BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
42 42
43LIBS.SunOS+= -lnsl -lsocket 43LIBS.SunOS+= -lnsl -lsocket
 44CPPFLAGS.SunOS+= -DBSD_COMP
44 45
45.if ${OBJECT_FMT} == "ELF" 46.if ${OBJECT_FMT} == "ELF"
46.include "../../devel/libelf/buildlink3.mk" 47.include "../../devel/libelf/buildlink3.mk"
47.endif 48.endif
48 49
49.include "../../converters/libiconv/buildlink3.mk" 50.include "../../converters/libiconv/buildlink3.mk"
50.include "../../devel/gettext-lib/buildlink3.mk" 51.include "../../devel/gettext-lib/buildlink3.mk"
51.include "../../devel/pcre/buildlink3.mk" 52.include "../../devel/pcre/buildlink3.mk"
52.include "../../devel/zlib/buildlink3.mk" 53.include "../../devel/zlib/buildlink3.mk"
53.include "../../devel/libffi/buildlink3.mk" 54.include "../../devel/libffi/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.171 -r1.172 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2012/05/04 10:22:08 1.171
+++ pkgsrc/devel/glib2/distinfo 2012/05/08 16:07:23 1.172
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.171 2012/05/04 10:22:08 obache Exp $ 1$NetBSD: distinfo,v 1.172 2012/05/08 16:07:23 hans Exp $
2 2
3SHA1 (glib-2.32.2.tar.xz) = 5898165e58c8f946c2b1fd05b910fe4476b64164 3SHA1 (glib-2.32.2.tar.xz) = 5898165e58c8f946c2b1fd05b910fe4476b64164
4RMD160 (glib-2.32.2.tar.xz) = 2ec828c54c31f07d9d28d182f1d6e8398e112928 4RMD160 (glib-2.32.2.tar.xz) = 2ec828c54c31f07d9d28d182f1d6e8398e112928
5Size (glib-2.32.2.tar.xz) = 6117764 bytes 5Size (glib-2.32.2.tar.xz) = 6117764 bytes
6SHA1 (patch-aa) = 059197e7e9ee88c87cea168635467780912519e0 6SHA1 (patch-aa) = 059197e7e9ee88c87cea168635467780912519e0
7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544 7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
10SHA1 (patch-af) = f35ea2e6101625555252b95596ea335f4ede651e 10SHA1 (patch-af) = f35ea2e6101625555252b95596ea335f4ede651e
11SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214 11SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7 12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
13SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492 13SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
14SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c 14SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
@@ -25,13 +25,14 @@ SHA1 (patch-ba) = f4233cd4e0109f9bee5630 @@ -25,13 +25,14 @@ SHA1 (patch-ba) = f4233cd4e0109f9bee5630
25SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac 25SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
26SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 26SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
27SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047 27SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
28SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f 28SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f
29SHA1 (patch-cf) = 7aec3254eb3edfa71da72f7a9c218d148a036bd4 29SHA1 (patch-cf) = 7aec3254eb3edfa71da72f7a9c218d148a036bd4
30SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a 30SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a
31SHA1 (patch-ci) = fcf75fc77bfcdaee8911f759d63978cd627d6ebb 31SHA1 (patch-ci) = fcf75fc77bfcdaee8911f759d63978cd627d6ebb
32SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22 32SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22
33SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2 33SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
34SHA1 (patch-cl) = de1d916aa9137aea278a223990fbde5b2ab9feb9 34SHA1 (patch-cl) = de1d916aa9137aea278a223990fbde5b2ab9feb9
35SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e 35SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
36SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f 36SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f
37SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad 37SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
 38SHA1 (patch-glib_tests_include.c) = 95f7d34e6e03849316bbfac1541eec4582b92ffc
File Added: pkgsrc/devel/glib2/patches/patch-glib_tests_include.c
$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>