parent
e8db98fcf7
commit
d356cc36bd
2 changed files with 3 additions and 100 deletions
|
@ -1,97 +0,0 @@
|
|||
--- src/runtime/arch.h 2016-11-30 08:07:36.000000000 +1100
|
||||
+++ src/runtime/arch.h 2016-12-23 22:05:10.590132243 +1100
|
||||
@@ -12,6 +12,9 @@
|
||||
#ifndef __ARCH_H__
|
||||
#define __ARCH_H__
|
||||
|
||||
+#ifndef __GLIBC__
|
||||
+#include <signal.h>
|
||||
+#endif
|
||||
#include "os.h"
|
||||
#include "signal.h"
|
||||
#include "thread.h"
|
||||
--- src/runtime/linux-os.h 2016-11-30 08:07:36.000000000 +1100
|
||||
+++ src/runtime/linux-os.h 2016-12-23 22:01:51.218121957 +1100
|
||||
@@ -24,7 +24,11 @@
|
||||
#include <linux/version.h>
|
||||
|
||||
// Needs to be defined before including target-arch.h
|
||||
+#ifdef __GLIBC__
|
||||
typedef caddr_t os_vm_address_t;
|
||||
+#else
|
||||
+typedef void *os_vm_address_t;
|
||||
+#endif
|
||||
typedef size_t os_vm_size_t;
|
||||
typedef off_t os_vm_offset_t;
|
||||
typedef int os_vm_prot_t;
|
||||
--- src/runtime/os.h 2016-11-30 08:07:36.000000000 +1100
|
||||
+++ src/runtime/os.h 2016-12-23 22:05:29.678133228 +1100
|
||||
@@ -17,6 +17,9 @@
|
||||
|
||||
#define _OS_H_INCLUDED_
|
||||
|
||||
+#ifndef __GLIBC__
|
||||
+#include <signal.h>
|
||||
+#endif
|
||||
#include "sbcl.h"
|
||||
#include "runtime.h"
|
||||
|
||||
--- src/runtime/runtime.h 2016-11-30 08:07:36.000000000 +1100
|
||||
+++ src/runtime/runtime.h 2016-12-23 22:05:59.766134780 +1100
|
||||
@@ -165,7 +165,9 @@
|
||||
void dyndebug_init(void);
|
||||
|
||||
#if QSHOW_SIGNAL_SAFE == 1 && !defined(LISP_FEATURE_WIN32)
|
||||
-
|
||||
+#ifndef __GLIBC__
|
||||
+typedef struct __sigset_t sigset_t;
|
||||
+#endif
|
||||
extern sigset_t blockable_sigset;
|
||||
|
||||
#define QSHOW_BLOCK \
|
||||
--- src/runtime/wrap.c 2016-11-30 08:07:36.000000000 +1100
|
||||
+++ src/runtime/wrap.c 2016-12-23 22:02:15.792123225 +1100
|
||||
@@ -35,7 +35,10 @@
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <fcntl.h>
|
||||
#include <math.h>
|
||||
+#ifndef __GLIBC__
|
||||
+#include <time.h>
|
||||
+#endif
|
||||
|
||||
#ifndef LISP_FEATURE_WIN32
|
||||
#include <pwd.h>
|
||||
--- contrib/sb-bsd-sockets/constants.lisp.orig
|
||||
+++ contrib/sb-bsd-sockets/constants.lisp
|
||||
@@ -93,8 +93,8 @@
|
||||
(:integer EAFNOSUPPORT "EAFNOSUPPORT")
|
||||
(:integer EINPROGRESS "EINPROGRESS")
|
||||
|
||||
- (:integer NETDB-INTERNAL #+hpux "h_NETDB_INTERNAL" #-hpux "NETDB_INTERNAL" "See errno.")
|
||||
- (:integer NETDB-SUCCESS #+hpux "h_NETDB_SUCCESS" #-hpux "NETDB_SUCCESS" "No problem.")
|
||||
+ (:integer NETDB-INTERNAL #+hpux "h_NETDB_INTERNAL" #-hpux "EAI_BADFLAGS" "See errno.")
|
||||
+ (:integer NETDB-SUCCESS #+hpux "h_NETDB_SUCCESS" #-hpux "F_OK" "No problem.")
|
||||
(:integer HOST-NOT-FOUND "HOST_NOT_FOUND" "Authoritative Answer Host not found.")
|
||||
(:integer TRY-AGAIN "TRY_AGAIN" "Non-Authoritative Host not found, or SERVERFAIL.")
|
||||
(:integer NO-RECOVERY "NO_RECOVERY" "Non recoverable errors, FORMERR, REFUSED, NOTIMP.")
|
||||
--- src/runtime/linux-os.c.orig
|
||||
+++ src/runtime/linux-os.c
|
||||
@@ -181,6 +181,9 @@
|
||||
int
|
||||
isnptl (void)
|
||||
{
|
||||
+#ifndef __GLIBC__
|
||||
+ return 1;
|
||||
+#endif
|
||||
size_t n = confstr (_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
|
||||
if (n > 0) {
|
||||
char *buf = alloca (n);
|
||||
--- src/runtime/memcpy.h.orig
|
||||
+++ src/runtime/memcpy.h
|
||||
@@ -1,4 +1,4 @@
|
||||
-#ifdef __linux__
|
||||
+#ifdef __GLIBC__
|
||||
#ifdef __amd64__
|
||||
#ifdef __ASSEMBLER__
|
||||
.symver memcpy,memcpy@GLIBC_2.2.5
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'sbcl'
|
||||
pkgname=sbcl
|
||||
version=2.0.4
|
||||
version=2.0.5
|
||||
revision=1
|
||||
archs="i686 x86_64* armv7l aarch64"
|
||||
|
||||
|
@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
|
|||
homepage="http://www.sbcl.org/"
|
||||
changelog="http://www.sbcl.org/news.html"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
|
||||
checksum=122b4641766be8fde87ea4464cf706ddc161a1c05f48dbebf2cdcd80318982d1
|
||||
checksum=0050f88dd12893c90f03e7b6c3b998929dcd08e7bb0ca5c4003be6110337e2cb
|
||||
nocross=yes
|
||||
nopie=yes
|
||||
|
||||
|
@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
|
|||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64)
|
||||
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
|
||||
checksum+=" e984e46c0e6de11962a35768d2ff8bd41083dfe69459b6e585e9698aca123d65"
|
||||
checksum+=" e74bb136cb31e034193faab0c3488b0f3531da52ffaf1afea59be6eb62b51e59"
|
||||
;;
|
||||
i686)
|
||||
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
|
||||
|
|
Loading…
Reference in a new issue