diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2014-11-28 11:47:00 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2014-11-28 11:47:00 +0000 |
commit | 2dcef6a2ec7aa2fd3a2b10a9f9b633258203ca39 (patch) | |
tree | cdca4fb66b630ab272a43ac8844e5ce4f2d21547 | |
parent | 4a2b68d419aec56a0692919e8a6e61466a623431 (diff) | |
download | pkgsrc-2dcef6a2ec7aa2fd3a2b10a9f9b633258203ca39.tar.gz |
Add a patch to fix compilation on Debian Etch. From Mikhail Gusarov in
PR pkg/49296.
-rw-r--r-- | lang/gcc49-libs/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc49/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc49/distinfo | 3 | ||||
-rw-r--r-- | lang/gcc49/patches/patch-libcilkrts_runtime_signal_node.c | 17 |
4 files changed, 23 insertions, 5 deletions
diff --git a/lang/gcc49-libs/Makefile b/lang/gcc49-libs/Makefile index ce2709c40a0..9dcdcd009cd 100644 --- a/lang/gcc49-libs/Makefile +++ b/lang/gcc49-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/09/04 18:49:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.2 2014/11/28 11:47:01 bsiegert Exp $ GCC_PKGNAME= gcc49 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -9,7 +9,7 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC49_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc49 package so that with the dependence pattern ## '{gcc49,gcc49-libs}>=4.9.*' pkg_all will choose gcc49-libs over gcc49. -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= # empty diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index 134fc20e49f..fc2720a56e2 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/09/07 07:35:14 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2014/11/28 11:47:00 bsiegert Exp $ GCC_PKGNAME= gcc49 .include "version.mk" @@ -9,7 +9,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC49_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc49-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! -#PKGREVISION= +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/} diff --git a/lang/gcc49/distinfo b/lang/gcc49/distinfo index 008dd36c0d8..e1e223183f0 100644 --- a/lang/gcc49/distinfo +++ b/lang/gcc49/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2014/11/19 15:21:45 wiz Exp $ +$NetBSD: distinfo,v 1.4 2014/11/28 11:47:00 bsiegert Exp $ SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a @@ -20,6 +20,7 @@ SHA1 (patch-gcc_ginclude_stddef.h) = 8af3e4b4058fc623c61e91f5771699f0ce679957 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 SHA1 (patch-include_libiberty.h) = 5254c6a421ae16c71571820f6f07906367f042ba SHA1 (patch-libcilkrts_runtime_os-unix.c) = 165e736decbc6e0e3d905d418d71cf4873927925 +SHA1 (patch-libcilkrts_runtime_signal_node.c) = e12fd7c9f109db568c46e915bd1bae28fae7b95a SHA1 (patch-libgcc_config.host) = c929bfbd17fcef36ec4f0eeebf27ceca7060d24c SHA1 (patch-libgcc_config_i386_dragonfly-unwind.h) = 5a7b12ece06cd7ad44191ea803ba703bd1464cb8 SHA1 (patch-libgcc_config_t-slibgcc-darwin) = 5e0d2df4622281f3f9bca3e948d0c7b209fab04c diff --git a/lang/gcc49/patches/patch-libcilkrts_runtime_signal_node.c b/lang/gcc49/patches/patch-libcilkrts_runtime_signal_node.c new file mode 100644 index 00000000000..539fccf1dcb --- /dev/null +++ b/lang/gcc49/patches/patch-libcilkrts_runtime_signal_node.c @@ -0,0 +1,17 @@ +$NetBSD: patch-libcilkrts_runtime_signal_node.c,v 1.1 2014/11/28 11:47:01 bsiegert Exp $ + +Work around broken <semaphore.h> in glibc < 2.5. + +Corresponding Debian bug report: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402318 + +--- libcilkrts/runtime/signal_node.c.orig 2014-10-20 00:37:57.000000000 +0200 ++++ libcilkrts/runtime/signal_node.c 2014-10-20 00:38:36.000000000 +0200 +@@ -51,6 +51,7 @@ + typedef HANDLE cilk_semaphore_t; + #else // Linux/MIC + # include <errno.h> ++# include <pthread.h> + # include <semaphore.h> + # include <stdio.h> + typedef sem_t cilk_semaphore_t; |