diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-15 11:42:10 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-15 11:42:10 +0000 |
| commit | 9f7047e6b66bb193b7de781ff2431e1d63ab0dda (patch) | |
| tree | 181dfa9d3903d04d2eab07773c4d46f32e1720b7 /devel/glib | |
| parent | 6e3a16c56f7e8b982e9610d65415c7b114d5655b (diff) | |
| download | pkgsrc-9f7047e6b66bb193b7de781ff2431e1d63ab0dda.tar.gz | |
Workaround broken configure tests for Darwin/clang. Add LICENSE.
Bump PKGREVISION.
Diffstat (limited to 'devel/glib')
| -rw-r--r-- | devel/glib/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib/patches/patch-ad | 20 |
3 files changed, 30 insertions, 6 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 0e233bb0c00..97017b3591c 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.89 2014/10/09 14:06:08 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2016/02/15 11:42:10 jperkin Exp $ DISTNAME= glib-1.2.10 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ ${MASTER_SITE_GNOME:=sources/glib/1.2/} @@ -9,6 +9,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://developer.gnome.org/glib/ COMMENT= Some useful routines for C programming (glib1) +LICENSE= gnu-lgpl-v2.1 CONFLICTS= gtk+-1.0.* @@ -33,6 +34,13 @@ PTHREAD_OPTS+= require CONFIGURE_ENV+= glib_cv_rtldglobal_broken=no .endif +# Tests are insufficient, override with correct values. +.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "clang" +CONFIGURE_ENV+= glib_cv_has__inline=yes +CONFIGURE_ENV+= glib_cv_has__inline__=yes +CONFIGURE_ENV+= glib_cv_hasinline=yes +.endif + .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" GCC_REQD+= 3.0 .endif diff --git a/devel/glib/distinfo b/devel/glib/distinfo index 64d829451cc..12c0ed02fdf 100644 --- a/devel/glib/distinfo +++ b/devel/glib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2015/11/03 03:27:28 agc Exp $ +$NetBSD: distinfo,v 1.23 2016/02/15 11:42:10 jperkin Exp $ SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa RMD160 (glib-1.2.10.tar.gz) = f19efe8c87ebeea979a4d36902d8a8209640cd95 @@ -7,7 +7,7 @@ Size (glib-1.2.10.tar.gz) = 421480 bytes SHA1 (patch-aa) = e9c6046c3766d74919bb03f12cd8e9e32cd4f2f9 SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7 SHA1 (patch-ac) = 4ce393ab5cd08f8971faf7967f21669df0caae52 -SHA1 (patch-ad) = 5fa5ea7cc11fdd8e2f14b6a05e7c77e8359e8ec4 +SHA1 (patch-ad) = edcdc80d77007be247352b46acc95d99853997e9 SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59 SHA1 (patch-af) = 3e3caa294cc64dd13beb61f327f647c2ba0ca6f7 SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604 diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad index a2f87871883..3d1a7acf7eb 100644 --- a/devel/glib/patches/patch-ad +++ b/devel/glib/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.15 2005/06/06 18:57:30 jmmv Exp $ +$NetBSD: patch-ad,v 1.16 2016/02/15 11:42:11 jperkin Exp $ ---- configure.orig 2001-03-15 16:44:01.000000000 +0100 +--- configure.orig 2001-03-15 15:44:01.000000000 +0000 +++ configure @@ -26,7 +26,7 @@ ac_default_prefix=/usr/local # @@ -11,6 +11,22 @@ $NetBSD: patch-ad,v 1.15 2005/06/06 18:57:30 jmmv Exp $ GLIB_INTERFACE_AGE=10 GLIB_BINARY_AGE=10 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION +@@ -3871,7 +3871,6 @@ cat > conftest.$ac_ext <<EOF + #line 3872 "configure" + #include "confdefs.h" + #include <stdlib.h> +-int main() { + + #if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) + # ifdef HAVE_WCTYPE_H +@@ -3884,6 +3883,7 @@ int main() { + #else + # define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) + #endif ++int main() { + iswalnum((wchar_t) 0); + + ; return 0; } @@ -5177,6 +5177,9 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REE G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi |