diff options
| author | drochner <drochner@pkgsrc.org> | 2007-11-27 21:33:22 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-11-27 21:33:22 +0000 |
| commit | a2f8d1406e7de4080bcf31a3aef7f28d0ce8abd3 (patch) | |
| tree | 5c648e8adbfd6defecb0252d6831a2315a4e8773 | |
| parent | 738b7fb099527f44a1354b8bedc600685155d806 (diff) | |
| download | pkgsrc-a2f8d1406e7de4080bcf31a3aef7f28d0ce8abd3.tar.gz | |
-remove a temporary hack which made that posix_memalign(3) was not used
even if present; the purpose was to allow use of both malloc
implementations of NetBSD-current, but since other pkgs are picking up
posix_memalign(3) too, and NetBSD-current will deal with the binary
compatibility problem, this is getting pointless
-comment out 2 selftests which depend on nonstandard behaviour of
GNU iconv(3) -- the code itself works as documented
ride on recent update
| -rw-r--r-- | devel/glib2/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-al | 20 |
3 files changed, 23 insertions, 4 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 8bf0292c73f..b06bc14f1b2 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2007/11/25 23:38:50 wiz Exp $ +# $NetBSD: Makefile,v 1.128 2007/11/27 21:33:22 drochner Exp $ # When updating glib2, please apply patch-ak to configure.in # Then run a matching version of autoconf to regen patch-aa. @@ -49,8 +49,6 @@ CONFIGURE_ENV+= F77=${FALSE:Q} CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} -CONFIGURE_ENV+= ac_cv_func_posix_memalign=no - .include "../../mk/bsd.prefs.mk" CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index bed5c033d52..b7ed2243e27 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.90 2007/11/26 00:26:21 tron Exp $ +$NetBSD: distinfo,v 1.91 2007/11/27 21:33:23 drochner Exp $ SHA1 (glib-2.14.4.tar.bz2) = 29f5d74ab83c36f98e86f560b993fce5ac60dedf RMD160 (glib-2.14.4.tar.bz2) = c8bf528187a9ed90fb66ec5c89b17500f03ccef6 @@ -14,3 +14,4 @@ SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68 +SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3 diff --git a/devel/glib2/patches/patch-al b/devel/glib2/patches/patch-al new file mode 100644 index 00000000000..2529efbd776 --- /dev/null +++ b/devel/glib2/patches/patch-al @@ -0,0 +1,20 @@ +$NetBSD: patch-al,v 1.3 2007/11/27 21:33:23 drochner Exp $ + +--- tests/convert-test.c.orig 2007-11-26 15:26:15.000000000 +0100 ++++ tests/convert-test.c +@@ -73,6 +73,7 @@ test_one_half (void) + g_assert (strcmp (out, "\xbd") == 0); + g_free (out); + ++#if 0 /* these 2 tests depend on GNU iconv specific behaviour */ + out = g_convert (in, -1, + "ISO-8859-15", "UTF-8", + &bytes_read, &bytes_written, +@@ -96,6 +97,7 @@ test_one_half (void) + g_assert (bytes_written == 1); + g_assert (strcmp (out, "a") == 0); + g_free (out); ++#endif + } + + static void |