mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-29 00:42:58 +02:00
virtuoso: unbreak musl, restrict to little endian archs
This commit is contained in:
parent
29821d7e14
commit
66afad20d4
3 changed files with 74 additions and 10 deletions
46
srcpkgs/virtuoso/patches/always-ieee-floats.patch
Normal file
46
srcpkgs/virtuoso/patches/always-ieee-floats.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
From bc8e9890de8c9866e6e1f49c8355ebee915579e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: q66 <daniel@octaforge.org>
|
||||||
|
Date: Wed, 29 Jan 2020 12:50:46 +0100
|
||||||
|
Subject: [PATCH 1/2] always use IEEE floats
|
||||||
|
|
||||||
|
We don't build on any platforms where this is not the case.
|
||||||
|
|
||||||
|
Fixes platforms for which this is not checked.
|
||||||
|
---
|
||||||
|
libsrc/Dk/Dkmarshal.c | 20 +-------------------
|
||||||
|
1 file changed, 1 insertion(+), 19 deletions(-)
|
||||||
|
|
||||||
|
diff --git libsrc/Dk/Dkmarshal.c libsrc/Dk/Dkmarshal.c
|
||||||
|
index da15a21..b2b6c71 100644
|
||||||
|
--- libsrc/Dk/Dkmarshal.c
|
||||||
|
+++ libsrc/Dk/Dkmarshal.c
|
||||||
|
@@ -31,25 +31,7 @@
|
||||||
|
# include <netinet/in.h> /* for ntohl, htonl */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if defined (i386) || \
|
||||||
|
- defined (_WIN64) || \
|
||||||
|
- defined (_M_IX86) || \
|
||||||
|
- defined (_M_ALPHA) || \
|
||||||
|
- defined (mc68000) || \
|
||||||
|
- defined (sparc) || \
|
||||||
|
- defined (__x86_64) || \
|
||||||
|
- defined (__alpha) || \
|
||||||
|
- defined (__powerpc) || \
|
||||||
|
- defined (mips) || \
|
||||||
|
- defined (__OS2__) || \
|
||||||
|
- defined (_IBMR2)
|
||||||
|
-# define _IEEE_FLOATS
|
||||||
|
-#elif defined (OPL_SOURCE)
|
||||||
|
-# include <librpc.h>
|
||||||
|
-#else
|
||||||
|
-# include <rpc/types.h>
|
||||||
|
-# include <rpc/xdr.h>
|
||||||
|
-#endif
|
||||||
|
+#define _IEEE_FLOATS
|
||||||
|
|
||||||
|
macro_char_func readtable[256];
|
||||||
|
ses_write_func writetable[256];
|
||||||
|
--
|
||||||
|
2.24.0
|
||||||
|
|
|
@ -1,16 +1,34 @@
|
||||||
Source: @pullmoll
|
From 125669821d95ff989bf94161b8e2497bfca9d0ab Mon Sep 17 00:00:00 2001
|
||||||
Upstream: no
|
From: q66 <daniel@octaforge.org>
|
||||||
Reason: Musl libc already defines PAGE_SIZE
|
Date: Wed, 29 Jan 2020 12:54:14 +0100
|
||||||
|
Subject: [PATCH 2/2] Use more portable page size check
|
||||||
|
|
||||||
--- libsrc/Dk/tlsf.h 2018-08-16 01:06:21.000000000 +0200
|
This fixes musl builds.
|
||||||
+++ libsrc/Dk/tlsf.h 2020-01-27 15:53:35.498205916 +0100
|
---
|
||||||
@@ -159,7 +159,9 @@
|
libsrc/Dk/tlsf.h | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git libsrc/Dk/tlsf.h libsrc/Dk/tlsf.h
|
||||||
|
index ddce478..a9687f4 100644
|
||||||
|
--- libsrc/Dk/tlsf.h
|
||||||
|
+++ libsrc/Dk/tlsf.h
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#define _TLSF_H_
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
extern size_t init_memory_pool(size_t, void *);
|
||||||
|
extern size_t get_used_size(void *);
|
||||||
|
@@ -159,7 +160,7 @@ extern void tlsf_base_free (void * c, size_t sz);
|
||||||
|
|
||||||
#define DEFAULT_AREA_SIZE (1024*10)
|
#define DEFAULT_AREA_SIZE (1024*10)
|
||||||
|
|
||||||
+#if defined(__GLIBC__)
|
-#define PAGE_SIZE (getpagesize())
|
||||||
#define PAGE_SIZE (getpagesize())
|
+#define PAGE_SIZE ((int)sysconf(_SC_PAGESIZE))
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#ifdef USE_PRINTF
|
#ifdef USE_PRINTF
|
||||||
|
--
|
||||||
|
2.24.0
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
pkgname=virtuoso
|
pkgname=virtuoso
|
||||||
version=7.2.5.1
|
version=7.2.5.1
|
||||||
revision=1
|
revision=1
|
||||||
archs="x86_64* aarch64* ppc64*"
|
archs="x86_64* aarch64* ppc64le*"
|
||||||
wrksrc="${pkgname}-opensource-${version}"
|
wrksrc="${pkgname}-opensource-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-static"
|
configure_args="--enable-static"
|
||||||
|
|
Loading…
Add table
Reference in a new issue