slurm-wlm: fix musl
This commit is contained in:
Jürgen Buchmüller
parent
68e36d6f55
commit
8a40c5bab4
5 changed files with 122 additions and 6 deletions
14
srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch
Normal file
14
srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Need _GNU_SOURCE defined to define cpu_set_t in sched.h
|
||||
|
||||
--- src/slurmd/slurmd/req.c 2019-12-20 21:43:45.000000000 +0100
|
||||
+++ src/slurmd/slurmd/req.c 2020-02-23 13:07:29.257513065 +0100
|
||||
@@ -49,6 +49,7 @@
|
||||
#include <numa.h>
|
||||
#endif
|
||||
#include <poll.h>
|
||||
+#define _GNU_SOURCE
|
||||
#include <pthread.h>
|
||||
#include <sched.h>
|
||||
#include <signal.h>
|
||||
15
srcpkgs/slurm-wlm/patches/musl-getgrent.patch
Normal file
15
srcpkgs/slurm-wlm/patches/musl-getgrent.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Musl libc does not have getgrent_r(3)
|
||||
|
||||
--- src/slurmctld/groups.c 2019-12-20 21:43:45.000000000 +0100
|
||||
+++ src/slurmctld/groups.c 2020-02-23 12:23:19.570618716 +0100
|
||||
@@ -155,7 +155,7 @@
|
||||
* databases), the rest of this function essentially does
|
||||
* nothing. */
|
||||
|
||||
-#if defined (__APPLE__)
|
||||
+#if defined (__APPLE__) || !defined(__GLIBC__)
|
||||
setgrent();
|
||||
while (1) {
|
||||
if ((grp_result = getgrent()) == NULL)
|
||||
15
srcpkgs/slurm-wlm/patches/musl-getpwent.patch
Normal file
15
srcpkgs/slurm-wlm/patches/musl-getpwent.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Musl libc does not have getpwent_r(3)
|
||||
|
||||
--- src/slurmctld/groups.c 2020-02-23 12:46:32.011563195 +0100
|
||||
+++ src/slurmctld/groups.c 2020-02-23 12:48:19.259558919 +0100
|
||||
@@ -206,7 +206,7 @@
|
||||
}
|
||||
endgrent();
|
||||
setpwent();
|
||||
-#if defined (__APPLE__)
|
||||
+#if defined (__APPLE__) || !defined(__GLIBC__)
|
||||
while ((pwd_result = getpwent()) != NULL) {
|
||||
#else
|
||||
while (!getpwent_r(&pw, pw_buffer, PW_BUF_SIZE, &pwd_result)) {
|
||||
75
srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch
Normal file
75
srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: Musl libc does not have inet_nsap_addr(3) [undocumented]
|
||||
|
||||
--- src/common/callerid.c 2019-12-20 21:43:45.000000000 +0100
|
||||
+++ src/common/callerid.c 2020-02-23 12:45:25.878565832 +0100
|
||||
@@ -81,6 +81,68 @@
|
||||
#define PATH_PROCNET_TCP6 "/proc/net/tcp6"
|
||||
#endif
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+/*
|
||||
+ * Copyright (c) 1996-1999 by Internet Software Consortium.
|
||||
+ *
|
||||
+ * Permission to use, copy, modify, and distribute this software for any
|
||||
+ * purpose with or without fee is hereby granted, provided that the above
|
||||
+ * copyright notice and this permission notice appear in all copies.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||||
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||||
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||||
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||||
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
+ * SOFTWARE.
|
||||
+ */
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/socket.h>
|
||||
+#include <netinet/in.h>
|
||||
+#include <arpa/inet.h>
|
||||
+#include <arpa/nameser.h>
|
||||
+#include <ctype.h>
|
||||
+#include <resolv.h>
|
||||
+static char
|
||||
+xtob(int c) {
|
||||
+ return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
|
||||
+}
|
||||
+
|
||||
+unsigned int inet_nsap_addr(const char *ascii, unsigned char *binary, int maxlen)
|
||||
+{
|
||||
+ unsigned char c, nib;
|
||||
+ unsigned int len = 0;
|
||||
+ while ((c = *ascii++) != '\0' && len < (unsigned int)maxlen) {
|
||||
+ if (c == '.' || c == '+' || c == '/')
|
||||
+ continue;
|
||||
+ if (!isascii(c))
|
||||
+ return (0);
|
||||
+ c = toupper(c);
|
||||
+ if (isxdigit(c)) {
|
||||
+ nib = xtob(c);
|
||||
+ c = *ascii++;
|
||||
+ if (c != '\0') {
|
||||
+ c = toupper(c);
|
||||
+ if (isxdigit(c)) {
|
||||
+ *binary++ = (nib << 4) | xtob(c);
|
||||
+ len++;
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+ return len;
|
||||
+}
|
||||
+#endif /* !defined(__GLIBC__) */
|
||||
+
|
||||
strong_alias(callerid_get_own_netinfo, slurm_callerid_get_own_netinfo);
|
||||
|
||||
static int _match_inode(callerid_conn_t *conn_result, ino_t *inode_search,
|
||||
|
|
@ -18,14 +18,11 @@ homepage="http://slurm.schedmd.com/slurm.html"
|
|||
distfiles="https://github.com/SchedMD/slurm/archive/slurm-${_distver}.tar.gz"
|
||||
checksum=e53e67bd0bb4c37a9c481998764a746467a96bc41d6527569080514f36452c07
|
||||
|
||||
case "${XBPS_TARGET_MACHINE}" in
|
||||
# Undefined: inet_nsap_addr and getgrent_r
|
||||
# Used in the core of the program.
|
||||
*-musl) broken="https://api.travis-ci.org/jobs/124091254/log.txt";;
|
||||
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
|
||||
# configure: error: 32-bit support is deprecated, and not tested
|
||||
# regularly. Use at your own risk.
|
||||
i686*|armv*) broken="32-bit support is deprecated by upstream";;
|
||||
esac
|
||||
broken="32-bit support is deprecated by upstream"
|
||||
fi
|
||||
|
||||
if [ -z "${CROSS_BUILD}" ]; then
|
||||
# The below at time of writing can not be cross compiled
|
||||
|
|
|
|||
Loading…
Reference in a new issue