diff options
author | nia <nia@pkgsrc.org> | 2022-04-02 11:48:19 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2022-04-02 11:48:19 +0000 |
commit | 4ebc332341c79587dbed60a07e6bdfd65ab07533 (patch) | |
tree | 4acac7292ef95afd4b44f0e42ba2f811e313c7d7 /parallel | |
parent | b650087ae170214f0369c63eed6a8ec2d86ae23e (diff) | |
download | pkgsrc-4ebc332341c79587dbed60a07e6bdfd65ab07533.tar.gz |
sge: get slightly further building, still BROKEN
Diffstat (limited to 'parallel')
-rw-r--r-- | parallel/sge/Makefile | 4 | ||||
-rw-r--r-- | parallel/sge/distinfo | 4 | ||||
-rw-r--r-- | parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c | 26 |
3 files changed, 29 insertions, 5 deletions
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index 99b7306816b..351b2bd1434 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2021/05/24 19:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2022/04/02 11:48:19 nia Exp $ DISTNAME= sge-8.1.6 PKGREVISION= 10 @@ -10,6 +10,8 @@ HOMEPAGE= https://arc.liv.ac.uk/trac/SGE COMMENT= Son of Grid Engine distributed resource management system LICENSE= sissl-1.1 AND 2-clause-bsd AND gnu-gpl-v2 AND gnu-lgpl-v2 +BROKEN+= "Incompatible with recent OpenSSL releases" + GNU_CONFIGURE= YES USE_TOOLS+= gmake csh perl:run diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo index 6b3160d5ed6..d9c28e99759 100644 --- a/parallel/sge/distinfo +++ b/parallel/sge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2021/10/26 11:10:38 nia Exp $ +$NetBSD: distinfo,v 1.24 2022/04/02 11:48:19 nia Exp $ BLAKE2s (sge-8.1.6.tar.gz) = 0fb07789c3a66f1792f46f538f152d56bc3c34cc391ed153eb6e071e35c01315 SHA512 (sge-8.1.6.tar.gz) = 5044acf4b3f37a785a383c6341b51fb026456ffd7e6f9c8bb7d115068f67e15a833fe2b504fa3652710fd54946ae36eabd872f0263f13d558ae4187b824a0aa6 @@ -14,5 +14,5 @@ SHA1 (patch-source-utilbin_Makefile) = 0a6fa06e71140ed8e74ebe0e5e37a4a3a515391b SHA1 (patch-source_3rdparty_sge_depend_def.h) = 92ad1ef5d0cf237fa083a262d38c67828593f679 SHA1 (patch-source_libs_comm_cl_ssl_framework.c) = 230c2a510b52516d9eea934b8c797141167a0b6d SHA1 (patch-source_libs_spool_berkeleydb_Makefile) = 9418b67308c96cda40d2d70026cb31ef6c937693 -SHA1 (patch-source_libs_uti_sge__loadmem.c) = d781009ee8efbfa210a698c885f0aab51ae96818 +SHA1 (patch-source_libs_uti_sge__loadmem.c) = a0beb90df3f9ec927f3e2570aced53c36875adea SHA1 (patch-source_util_arch) = c544eca206d2b260ed881f5112bedde68ac5029a diff --git a/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c b/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c index 5e78cc0652f..60cce28bd8d 100644 --- a/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c +++ b/parallel/sge/patches/patch-source_libs_uti_sge__loadmem.c @@ -1,8 +1,21 @@ -$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.2 2014/01/14 10:21:39 markd Exp $ +$NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.3 2022/04/02 11:48:20 nia Exp $ + +_KMEMUSER is defined too late which causes vaddr_t to be undefined +by the time machine/types.h is included. --- source/libs/uti/sge_loadmem.c.orig 2013-10-28 16:22:54.000000000 +0000 +++ source/libs/uti/sge_loadmem.c -@@ -45,6 +45,10 @@ +@@ -29,6 +29,9 @@ + * + ************************************************************************/ + /*___INFO__MARK_END__*/ ++#ifdef __NetBSD__ ++#define _KMEMUSER ++#endif + #include <stdio.h> + #include <string.h> + #include <locale.h> +@@ -45,6 +48,10 @@ #include "uti/sge_log.h" #include "uti/msg_utilib.h" @@ -13,3 +26,12 @@ $NetBSD: patch-source_libs_uti_sge__loadmem.c,v 1.2 2014/01/14 10:21:39 markd Ex #if !defined(__linux__) && !defined(DARWIN) && !defined(FREEBSD) && !defined(NETBSD) #include <unistd.h> +@@ -620,7 +627,7 @@ int sge_loadmem(sge_mem_info_t *mem_info + + #if defined(NETBSD) + +-#define _KMEMUSER ++#include <machine/types.h> + #include <sys/param.h> + #include <sys/sysctl.h> + |