summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2014-01-01 15:50:01 +0000
committerschmonz <schmonz@pkgsrc.org>2014-01-01 15:50:01 +0000
commit039c4bd7a678d1379b928bf7a60812785f128b0b (patch)
tree87474fcad1b18deb010b3755ef7379e13821e170
parent7e22f60ef4f34126b717a9c3acb4339734a2987f (diff)
downloadpkgsrc-039c4bd7a678d1379b928bf7a60812785f128b0b.tar.gz
Fix previous for OS X 10.9 with clang (and maybe other non-glibc systems).
-rw-r--r--converters/libiconv/distinfo4
-rw-r--r--converters/libiconv/patches/patch-srclib_stdio.in.h11
2 files changed, 8 insertions, 7 deletions
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index dcfb8e7dffa..87360f77d06 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2013/12/31 10:14:14 ryoon Exp $
+$NetBSD: distinfo,v 1.39 2014/01/01 15:50:01 schmonz Exp $
SHA1 (libiconv-1.13-cp932.patch.gz) = 3dd6ed92e0d9f58db71edf63e31ab6cbd4420f99
RMD160 (libiconv-1.13-cp932.patch.gz) = 71040b00489ad1a5f218a09b4d22e550b1d31fc8
@@ -11,4 +11,4 @@ SHA1 (patch-ab) = 5ee1e7573d84fb857fb96387653c191008d96b02
SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782
SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6
-SHA1 (patch-srclib_stdio.in.h) = a041eb1056f293a25f08969b4c2112623ec66922
+SHA1 (patch-srclib_stdio.in.h) = 0d72478608096ab621864cb7966dc735a75b93bc
diff --git a/converters/libiconv/patches/patch-srclib_stdio.in.h b/converters/libiconv/patches/patch-srclib_stdio.in.h
index 9636448ce97..5a39deee2c7 100644
--- a/converters/libiconv/patches/patch-srclib_stdio.in.h
+++ b/converters/libiconv/patches/patch-srclib_stdio.in.h
@@ -1,18 +1,19 @@
-$NetBSD: patch-srclib_stdio.in.h,v 1.1 2013/12/31 10:14:14 ryoon Exp $
+$NetBSD: patch-srclib_stdio.in.h,v 1.2 2014/01/01 15:50:01 schmonz Exp $
* Fix build on glibc>=2.16
From http://www.itkb.ro/kb/linux/patch-libiconv-pentru-glibc-216
--- srclib/stdio.in.h.orig 2011-08-07 13:42:06.000000000 +0000
+++ srclib/stdio.in.h
-@@ -695,8 +695,10 @@ _GL_CXXALIASWARN (gets);
+@@ -695,7 +695,11 @@ _GL_CXXALIASWARN (gets);
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
++# if !__GLIBC_PREREQ(2, 16)
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
++# endif
+#endif
+ #endif
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@