srcpkgs: adjust patch_args to -Np1 for patches being symlinked
This commit is contained in:
parent
8be2201d76
commit
847bd2d11e
|
@ -18,6 +18,7 @@ license="BSD-3-Clause"
|
|||
homepage="https://www.cmake.org"
|
||||
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
|
||||
checksum=4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8
|
||||
patch_args=-Np1
|
||||
|
||||
# XXX: cmake is broken if cmake was built with -GNinja
|
||||
# https://bugs.gentoo.org/596460
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
|
||||
+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
|
||||
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
|
||||
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
|
||||
@@ -33,9 +33,9 @@
|
||||
[[librunpath_parent_unresolved\.so]]
|
||||
[[librunpath_unresolved\.so]]
|
||||
|
|
|
@ -24,8 +24,8 @@ Let's define them when non main stream like None is specified as CMAKE_BUILD_TY
|
|||
|
||||
diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
|
||||
index a3d98f685f..f83759ca10 100644
|
||||
--- Tests/ConfigSources/CMakeLists.txt
|
||||
+++ Tests/ConfigSources/CMakeLists.txt
|
||||
--- a/Tests/ConfigSources/CMakeLists.txt
|
||||
+++ b/Tests/ConfigSources/CMakeLists.txt
|
||||
@@ -74,10 +74,10 @@ add_custom_command(APPEND
|
||||
VERBATIM
|
||||
)
|
||||
|
|
|
@ -17,6 +17,7 @@ homepage="https://www.cmake.org"
|
|||
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
|
||||
checksum=4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8
|
||||
replaces="cmake-bootstrap>=0"
|
||||
patch_args=-Np1
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
build_style=cmake
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200
|
||||
+++ src/Unique.cpp 2016-04-24 08:09:18.615896283 +0200
|
||||
--- a/src/Unique.cpp.orig 2016-04-24 08:08:43.921536576 +0200
|
||||
+++ b/src/Unique.cpp 2016-04-24 08:09:18.615896283 +0200
|
||||
@@ -1,10 +1,16 @@
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include "config.h"
|
||||
|
|
|
@ -13,6 +13,7 @@ license="BSD-3-Clause"
|
|||
homepage="http://dmedvinsky.github.io/gsimplecal/"
|
||||
distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
|
||||
checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
|
||||
patch_args=-Np1
|
||||
|
||||
replaces="gsimplecal-gtk3>=0"
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ license="BSD-3-Clause"
|
|||
homepage="http://dmedvinsky.github.io/gsimplecal/"
|
||||
distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
|
||||
checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
|
||||
patch_args=-Np1
|
||||
|
||||
replaces="gsimplecal-gtk2>=0"
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ license="MIT"
|
|||
homepage="http://www.musl-libc.org/"
|
||||
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
|
||||
checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
|
||||
patch_args=-Np1
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
ppc*) CFLAGS="-mlong-double-64";;
|
||||
|
|
|
@ -16,8 +16,8 @@ __dl_thread_cleanup.
|
|||
|
||||
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
|
||||
index 5f491092..6a3b0c21 100644
|
||||
--- src/thread/pthread_create.c
|
||||
+++ src/thread/pthread_create.c
|
||||
--- a/src/thread/pthread_create.c
|
||||
+++ b/src/thread/pthread_create.c
|
||||
@@ -90,14 +90,7 @@ _Noreturn void __pthread_exit(void *result)
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -36,8 +36,8 @@ needs to be taken to produce a safe design.
|
|||
|
||||
diff --git a/src/internal/libc.h b/src/internal/libc.h
|
||||
index ac97dc7e..c0614852 100644
|
||||
--- src/internal/libc.h
|
||||
+++ src/internal/libc.h
|
||||
--- a/src/internal/libc.h
|
||||
+++ b/src/internal/libc.h
|
||||
@@ -21,7 +21,7 @@ struct __libc {
|
||||
int can_do_threads;
|
||||
int threaded;
|
||||
|
@ -49,8 +49,8 @@ index ac97dc7e..c0614852 100644
|
|||
size_t tls_size, tls_align, tls_cnt;
|
||||
diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c
|
||||
index 96982596..2553a62e 100644
|
||||
--- src/malloc/malloc.c
|
||||
+++ src/malloc/malloc.c
|
||||
--- a/src/malloc/malloc.c
|
||||
+++ b/src/malloc/malloc.c
|
||||
@@ -26,7 +26,7 @@ int __malloc_replaced;
|
||||
|
||||
static inline void lock(volatile int *lk)
|
||||
|
@ -62,8 +62,8 @@ index 96982596..2553a62e 100644
|
|||
|
||||
diff --git a/src/thread/__lock.c b/src/thread/__lock.c
|
||||
index 45557c88..5b9b144e 100644
|
||||
--- src/thread/__lock.c
|
||||
+++ src/thread/__lock.c
|
||||
--- a/src/thread/__lock.c
|
||||
+++ b/src/thread/__lock.c
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
void __lock(volatile int *l)
|
||||
|
|
|
@ -10,8 +10,8 @@ these are all flags that can be single-byte values.
|
|||
|
||||
diff --git a/src/internal/libc.h b/src/internal/libc.h
|
||||
index c0614852..d47f58e0 100644
|
||||
--- src/internal/libc.h
|
||||
+++ src/internal/libc.h
|
||||
--- a/src/internal/libc.h
|
||||
+++ b/src/internal/libc.h
|
||||
@@ -18,9 +18,9 @@ struct tls_module {
|
||||
};
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@ memory load after the lock is taken.
|
|||
|
||||
diff --git a/src/internal/libc.h b/src/internal/libc.h
|
||||
index d47f58e0..619bba86 100644
|
||||
--- src/internal/libc.h
|
||||
+++ src/internal/libc.h
|
||||
--- a/src/internal/libc.h
|
||||
+++ b/src/internal/libc.h
|
||||
@@ -21,6 +21,7 @@ struct __libc {
|
||||
char can_do_threads;
|
||||
char threaded;
|
||||
|
@ -31,8 +31,8 @@ index d47f58e0..619bba86 100644
|
|||
struct tls_module *tls_head;
|
||||
diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c
|
||||
index 2553a62e..a803d4c9 100644
|
||||
--- src/malloc/malloc.c
|
||||
+++ src/malloc/malloc.c
|
||||
--- a/src/malloc/malloc.c
|
||||
+++ b/src/malloc/malloc.c
|
||||
@@ -26,8 +26,11 @@ int __malloc_replaced;
|
||||
|
||||
static inline void lock(volatile int *lk)
|
||||
|
@ -48,8 +48,8 @@ index 2553a62e..a803d4c9 100644
|
|||
static inline void unlock(volatile int *lk)
|
||||
diff --git a/src/thread/__lock.c b/src/thread/__lock.c
|
||||
index 5b9b144e..60eece49 100644
|
||||
--- src/thread/__lock.c
|
||||
+++ src/thread/__lock.c
|
||||
--- a/src/thread/__lock.c
|
||||
+++ b/src/thread/__lock.c
|
||||
@@ -18,9 +18,11 @@
|
||||
|
||||
void __lock(volatile int *l)
|
||||
|
@ -65,8 +65,8 @@ index 5b9b144e..60eece49 100644
|
|||
for (unsigned i = 0; i < 10; ++i) {
|
||||
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
|
||||
index 6a3b0c21..6bdfb44f 100644
|
||||
--- src/thread/pthread_create.c
|
||||
+++ src/thread/pthread_create.c
|
||||
--- a/src/thread/pthread_create.c
|
||||
+++ b/src/thread/pthread_create.c
|
||||
@@ -118,8 +118,8 @@ _Noreturn void __pthread_exit(void *result)
|
||||
* until the lock is released, which only happens after SYS_exit
|
||||
* has been called, via the exit futex address pointing at the lock.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- src/multibyte/wcsnrtombs.c
|
||||
+++ src/multibyte/wcsnrtombs.c
|
||||
--- a/src/multibyte/wcsnrtombs.c
|
||||
+++ b/src/multibyte/wcsnrtombs.c
|
||||
@@ -1,41 +1,33 @@
|
||||
#include <wchar.h>
|
||||
+#include <limits.h>
|
||||
|
|
|
@ -2,8 +2,8 @@ Use types compatible with glibc/kernel headers.
|
|||
|
||||
diff --git a/arch/aarch64/bits/signal.h b/arch/aarch64/bits/signal.h
|
||||
index b71261f5..5098c734 100644
|
||||
--- arch/aarch64/bits/signal.h
|
||||
+++ arch/aarch64/bits/signal.h
|
||||
--- a/arch/aarch64/bits/signal.h
|
||||
+++ b/arch/aarch64/bits/signal.h
|
||||
@@ -11,7 +11,7 @@ typedef unsigned long greg_t;
|
||||
typedef unsigned long gregset_t[34];
|
||||
|
||||
|
@ -24,8 +24,8 @@ index b71261f5..5098c734 100644
|
|||
struct _aarch64_ctx head;
|
||||
diff --git a/arch/aarch64/bits/user.h b/arch/aarch64/bits/user.h
|
||||
index d12cdf7f..8a1002aa 100644
|
||||
--- arch/aarch64/bits/user.h
|
||||
+++ arch/aarch64/bits/user.h
|
||||
--- a/arch/aarch64/bits/user.h
|
||||
+++ b/arch/aarch64/bits/user.h
|
||||
@@ -6,7 +6,7 @@ struct user_regs_struct {
|
||||
};
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@ cancellation points should be done.
|
|||
|
||||
diff --git src/linux/epoll.c src/linux/epoll.c
|
||||
index deff5b10..93baa814 100644
|
||||
--- src/linux/epoll.c
|
||||
+++ src/linux/epoll.c
|
||||
--- a/src/linux/epoll.c
|
||||
+++ b/src/linux/epoll.c
|
||||
@@ -24,9 +24,9 @@ int epoll_ctl(int fd, int op, int fd2, struct epoll_event *ev)
|
||||
|
||||
int epoll_pwait(int fd, struct epoll_event *ev, int cnt, int to, const sigset_t *sigs)
|
||||
|
|
|
@ -7,8 +7,8 @@ analogous to commit a60457c84a4b59ab564d7f4abb660a70283ba98d.
|
|||
|
||||
diff --git include/ctype.h include/ctype.h
|
||||
index 7936536f..32bcef4d 100644
|
||||
--- include/ctype.h
|
||||
+++ include/ctype.h
|
||||
--- a/include/ctype.h
|
||||
+++ b/include/ctype.h
|
||||
@@ -64,7 +64,9 @@ int isascii(int);
|
||||
int toascii(int);
|
||||
#define _tolower(a) ((a)|0x20)
|
||||
|
|
|
@ -6,8 +6,8 @@ and probably others.
|
|||
|
||||
--xtraeme
|
||||
|
||||
--- src/locale/__mo_lookup.c.orig 2019-06-26 09:55:36.843012674 +0200
|
||||
+++ src/locale/__mo_lookup.c 2019-06-26 09:56:11.529443955 +0200
|
||||
--- a/src/locale/__mo_lookup.c.orig 2019-06-26 09:55:36.843012674 +0200
|
||||
+++ b/src/locale/__mo_lookup.c 2019-06-26 09:56:11.529443955 +0200
|
||||
@@ -13,7 +13,7 @@ const char *__mo_lookup(const void *p, s
|
||||
uint32_t b = 0, n = swapc(mo[2], sw);
|
||||
uint32_t o = swapc(mo[3], sw);
|
||||
|
|
|
@ -12,8 +12,8 @@ Date: Sat Oct 19 15:53:43 2019 -0400
|
|||
|
||||
diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
|
||||
index 06efb11c..c1bf3caf 100644
|
||||
--- arch/powerpc/bits/signal.h
|
||||
+++ arch/powerpc/bits/signal.h
|
||||
--- a/arch/powerpc/bits/signal.h
|
||||
+++ b/arch/powerpc/bits/signal.h
|
||||
@@ -28,7 +28,7 @@ struct sigcontext {
|
||||
int signal;
|
||||
unsigned long handler;
|
||||
|
@ -25,8 +25,8 @@ index 06efb11c..c1bf3caf 100644
|
|||
typedef struct {
|
||||
diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
|
||||
index 4dec22a5..d5493b18 100644
|
||||
--- arch/powerpc64/bits/signal.h
|
||||
+++ arch/powerpc64/bits/signal.h
|
||||
--- a/arch/powerpc64/bits/signal.h
|
||||
+++ b/arch/powerpc64/bits/signal.h
|
||||
@@ -32,7 +32,7 @@ typedef struct sigcontext {
|
||||
int _pad0;
|
||||
unsigned long handler;
|
||||
|
|
|
@ -14,8 +14,8 @@ Date: Sat Oct 19 15:39:45 2019 -0400
|
|||
|
||||
diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
|
||||
index 2cc0604c..4dec22a5 100644
|
||||
--- arch/powerpc64/bits/signal.h
|
||||
+++ arch/powerpc64/bits/signal.h
|
||||
--- a/arch/powerpc64/bits/signal.h
|
||||
+++ b/arch/powerpc64/bits/signal.h
|
||||
@@ -9,11 +9,7 @@
|
||||
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@ Subject: [PATCH] add ppc32 le subarch
|
|||
|
||||
diff --git configure configure
|
||||
index 8680128..f1ca58e 100755
|
||||
--- configure
|
||||
+++ configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -645,6 +645,7 @@ fi
|
||||
if test "$ARCH" = "powerpc" ; then
|
||||
trycppif "__NO_FPRS__ && !_SOFT_FLOAT" "$t" && fail \
|
||||
|
|
|
@ -11,8 +11,8 @@ while glibc 2.29 allows its usage in _DEFAULT_SOURCE.
|
|||
|
||||
diff --git a/include/stdlib.h b/include/stdlib.h
|
||||
index 194c2033..b54a051f 100644
|
||||
--- include/stdlib.h
|
||||
+++ include/stdlib.h
|
||||
--- a/include/stdlib.h
|
||||
+++ b/include/stdlib.h
|
||||
@@ -145,6 +145,7 @@ int getloadavg(double *, int);
|
||||
int clearenv(void);
|
||||
#define WCOREDUMP(s) ((s) & 0x80)
|
||||
|
@ -25,7 +25,7 @@ diff --git a/src/malloc/reallocarray.c b/src/malloc/reallocarray.c
|
|||
new file mode 100644
|
||||
index 00000000..4a6ebe46
|
||||
--- /dev/null
|
||||
+++ src/malloc/reallocarray.c
|
||||
+++ b/src/malloc/reallocarray.c
|
||||
@@ -0,0 +1,13 @@
|
||||
+#define _BSD_SOURCE
|
||||
+#include <errno.h>
|
||||
|
|
|
@ -13,6 +13,7 @@ license="MIT"
|
|||
homepage="http://www.musl-libc.org/"
|
||||
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
|
||||
checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
|
||||
patch_args=-Np1
|
||||
|
||||
nostrip_files="libc.so"
|
||||
shlib_provides="libc.so"
|
||||
|
|
|
@ -13,6 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
|
|||
homepage="https://www.qemu.org"
|
||||
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
|
||||
checksum=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c
|
||||
patch_args=-Np1
|
||||
|
||||
_fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
|
||||
microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
|
||||
|
|
|
@ -16,8 +16,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
|||
|
||||
diff --git a/linux-user/signal.c b/linux-user/signal.c
|
||||
index 5ca6d62b15..e917c16d91 100644
|
||||
--- linux-user/signal.c
|
||||
+++ linux-user/signal.c
|
||||
--- a/linux-user/signal.c
|
||||
+++ b/linux-user/signal.c
|
||||
@@ -25,6 +25,13 @@
|
||||
#include "trace.h"
|
||||
#include "signal-common.h"
|
||||
|
|
|
@ -2,8 +2,8 @@ Source: @pullmoll
|
|||
Upstream: no
|
||||
Reason: Target architectures with soft float do not define these constants.
|
||||
|
||||
--- tests/fp/fp-bench.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ tests/fp/fp-bench.c 2020-12-12 20:38:40.702235420 +0100
|
||||
--- a/tests/fp/fp-bench.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ b/tests/fp/fp-bench.c 2020-12-12 20:38:40.702235420 +0100
|
||||
@@ -485,16 +485,32 @@
|
||||
|
||||
switch (rounding) {
|
||||
|
|
|
@ -8,8 +8,8 @@ Also speed up the loop when checking for increasing the mappings size to go
|
|||
in steps of TARGET_PAGE_SIZE and OR-in a check for the very last byte of the range.
|
||||
diff --git linux-user/mmap.c linux-user/mmap.c
|
||||
index 7e3b245..1e8d0f1 100644
|
||||
--- linux-user/mmap.c
|
||||
+++ linux-user/mmap.c
|
||||
--- a/linux-user/mmap.c
|
||||
+++ b/linux-user/mmap.c
|
||||
@@ -738,7 +738,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
|
||||
!guest_range_valid_untagged(new_addr, new_size)) ||
|
||||
((flags & MREMAP_MAYMOVE) == 0 &&
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- hw/9pfs/9p.c.orig 2016-12-21 15:53:59.997900753 +0100
|
||||
+++ hw/9pfs/9p.c 2016-12-21 15:54:03.006935717 +0100
|
||||
--- a/hw/9pfs/9p.c.orig 2016-12-21 15:53:59.997900753 +0100
|
||||
+++ b/hw/9pfs/9p.c 2016-12-21 15:54:03.006935717 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
*
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- linux-user/syscall.c.orig 2017-04-25 23:46:47.896819860 +0200
|
||||
+++ linux-user/syscall.c 2017-04-26 08:43:48.821452132 +0200
|
||||
--- a/linux-user/syscall.c.orig 2017-04-25 23:46:47.896819860 +0200
|
||||
+++ b/linux-user/syscall.c 2017-04-26 08:43:48.821452132 +0200
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/swap.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- linux-user/syscall.c.orig 2015-04-10 07:10:06.305662505 +0000
|
||||
+++ linux-user/syscall.c 2015-04-10 07:36:53.801871968 +0000
|
||||
--- a/linux-user/syscall.c.orig 2015-04-10 07:10:06.305662505 +0000
|
||||
+++ b/linux-user/syscall.c 2015-04-10 07:36:53.801871968 +0000
|
||||
@@ -5020,9 +5020,20 @@
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@ Source: https://github.com/void-linux/void-packages/issues/23557
|
|||
|
||||
diff --git linux-user/syscall.c linux-user/syscall.c
|
||||
index 945fc25..8d8b68a 100644
|
||||
--- linux-user/syscall.c
|
||||
+++ linux-user/syscall.c
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -3071,7 +3071,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
|
||||
int flags, int send)
|
||||
{
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- accel/tcg/user-exec.c
|
||||
+++ accel/tcg/user-exec.c
|
||||
--- a/accel/tcg/user-exec.c
|
||||
+++ b/accel/tcg/user-exec.c
|
||||
@@ -286,6 +286,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
|
||||
*/
|
||||
#ifdef linux
|
||||
|
@ -44,8 +44,8 @@
|
|||
#endif /* linux */
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
--- linux-user/host/ppc64/hostdep.h
|
||||
+++ linux-user/host/ppc64/hostdep.h
|
||||
--- a/linux-user/host/ppc64/hostdep.h
|
||||
+++ b/linux-user/host/ppc64/hostdep.h
|
||||
@@ -27,7 +27,11 @@ extern char safe_syscall_end[];
|
||||
static inline void rewind_if_in_safe_syscall(void *puc)
|
||||
{
|
||||
|
@ -58,8 +58,8 @@
|
|||
|
||||
if (*pcreg > (uintptr_t)safe_syscall_start
|
||||
&& *pcreg < (uintptr_t)safe_syscall_end) {
|
||||
--- util/mmap-alloc.c
|
||||
+++ util/mmap-alloc.c
|
||||
--- a/util/mmap-alloc.c
|
||||
+++ b/util/mmap-alloc.c
|
||||
@@ -25,6 +25,10 @@
|
||||
|
||||
#ifdef CONFIG_LINUX
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- contrib/vhost-user-input/main.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ contrib/vhost-user-input/main.c 2020-12-12 20:59:04.316996648 +0100
|
||||
--- a/contrib/vhost-user-input/main.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ b/contrib/vhost-user-input/main.c 2020-12-12 20:59:04.316996648 +0100
|
||||
@@ -114,14 +114,17 @@
|
||||
|
||||
static void vi_handle_status(VuInput *vi, virtio_input_event *event)
|
||||
|
@ -19,8 +19,8 @@
|
|||
evdev.type = le16toh(event->type);
|
||||
evdev.code = le16toh(event->code);
|
||||
evdev.value = le32toh(event->value);
|
||||
--- hw/input/virtio-input-host.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ hw/input/virtio-input-host.c 2020-12-12 21:33:44.750471890 +0100
|
||||
--- a/hw/input/virtio-input-host.c 2020-12-08 17:59:44.000000000 +0100
|
||||
+++ b/hw/input/virtio-input-host.c 2020-12-12 21:33:44.750471890 +0100
|
||||
@@ -192,14 +192,17 @@
|
||||
virtio_input_event *event)
|
||||
{
|
||||
|
|
|
@ -14,8 +14,8 @@ Subject: [PATCH] support ppcle architecture
|
|||
|
||||
diff --git configure configure
|
||||
index 18c26e0..03d3e18 100755
|
||||
--- configure
|
||||
+++ configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -653,7 +653,11 @@ elif check_define _ARCH_PPC ; then
|
||||
cpu="ppc64"
|
||||
fi
|
||||
|
@ -62,7 +62,7 @@ diff --git default-configs/targets/ppcle-linux-user.mak default-configs/targets/
|
|||
new file mode 100644
|
||||
index 0000000..2259243
|
||||
--- /dev/null
|
||||
+++ default-configs/targets/ppcle-linux-user.mak
|
||||
+++ b/default-configs/targets/ppcle-linux-user.mak
|
||||
@@ -0,0 +1,4 @@
|
||||
+TARGET_ARCH=ppc
|
||||
+TARGET_SYSTBL_ABI=common,nospu,32
|
||||
|
@ -70,8 +70,8 @@ index 0000000..2259243
|
|||
+TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
|
||||
diff --git linux-user/ppc/target_syscall.h linux-user/ppc/target_syscall.h
|
||||
index b9c4b81..cf26497 100644
|
||||
--- linux-user/ppc/target_syscall.h
|
||||
+++ linux-user/ppc/target_syscall.h
|
||||
--- a/linux-user/ppc/target_syscall.h
|
||||
+++ b/linux-user/ppc/target_syscall.h
|
||||
@@ -65,7 +65,11 @@ struct target_revectored_struct {
|
||||
#define UNAME_MACHINE "ppc64le"
|
||||
#endif
|
||||
|
@ -86,8 +86,8 @@ index b9c4b81..cf26497 100644
|
|||
|
||||
diff --git scripts/qemu-binfmt-conf.sh scripts/qemu-binfmt-conf.sh
|
||||
index 9f1580a..393943f 100755
|
||||
--- scripts/qemu-binfmt-conf.sh
|
||||
+++ scripts/qemu-binfmt-conf.sh
|
||||
--- a/scripts/qemu-binfmt-conf.sh
|
||||
+++ b/scripts/qemu-binfmt-conf.sh
|
||||
@@ -46,6 +46,10 @@ ppc_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x
|
||||
ppc_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
|
||||
ppc_family=ppc
|
||||
|
@ -110,8 +110,8 @@ index 9f1580a..393943f 100755
|
|||
arm|armel|armhf|arm64|armv[4-9]*l|aarch64)
|
||||
diff --git tests/tcg/configure.sh tests/tcg/configure.sh
|
||||
index e1b70e2..e07f5fe 100755
|
||||
--- tests/tcg/configure.sh
|
||||
+++ tests/tcg/configure.sh
|
||||
--- a/tests/tcg/configure.sh
|
||||
+++ b/tests/tcg/configure.sh
|
||||
@@ -59,6 +59,8 @@ fi
|
||||
: $(cross_cc_mips="mips-linux-gnu-gcc")
|
||||
: ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
|
||||
|
|
|
@ -30,6 +30,7 @@ nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
|
|||
opensbi-riscv64-generic-fw_dynamic.elf"
|
||||
# FIXME
|
||||
make_check=extended
|
||||
patch_args=-Np1
|
||||
|
||||
build_options="gtk3 opengl sdl2 spice virgl smartcard numa iscsi"
|
||||
build_options_default="opengl gtk3 virgl sdl2 numa iscsi"
|
||||
|
|
|
@ -16,6 +16,7 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
||||
distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
|
||||
checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
|
||||
patch_args=-Np1
|
||||
|
||||
pre_configure() {
|
||||
local _cfgdir="$XBPS_COMMONDIR/environment/configure"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Define __SWORD_TYPE for musl.
|
||||
|
||||
--- sys-utils/switch_root.c.orig 2014-09-20 21:33:27.551345526 +0200
|
||||
+++ sys-utils/switch_root.c 2014-09-20 21:34:17.958584374 +0200
|
||||
--- a/sys-utils/switch_root.c.orig 2014-09-20 21:33:27.551345526 +0200
|
||||
+++ b/sys-utils/switch_root.c 2014-09-20 21:34:17.958584374 +0200
|
||||
@@ -47,6 +47,15 @@
|
||||
#define MNT_DETACH 0x00000002 /* Just detach from the tree */
|
||||
#endif
|
||||
|
|
|
@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
||||
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
|
||||
checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
|
||||
patch_args=-Np1
|
||||
|
||||
# Create uuidd system account for uuidd.
|
||||
system_accounts="_uuidd"
|
||||
|
|
|
@ -17,6 +17,7 @@ homepage="https://github.com/void-linux/xbps"
|
|||
changelog="https://github.com/void-linux/xbps/blob/master/NEWS"
|
||||
distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz"
|
||||
checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
|
||||
patch_args=-Np1
|
||||
|
||||
do_configure() {
|
||||
./configure --prefix=/usr --sysconfdir=/etc --enable-static
|
||||
|
|
|
@ -4,8 +4,8 @@ when using strong stack protector)
|
|||
|
||||
diff --git lib/Makefile lib/Makefile
|
||||
index 65342ef..847bfdd 100644
|
||||
--- lib/Makefile
|
||||
+++ lib/Makefile
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -78,7 +78,7 @@ $(OBJS): %.o: %.c
|
||||
|
||||
libxbps.so: $(LIBFETCH_OBJS) $(LIBPROP_OBJS) $(OBJS)
|
||||
|
|
|
@ -11,6 +11,7 @@ homepage="https://github.com/void-linux/xbps"
|
|||
changelog="https://github.com/void-linux/xbps/blob/master/NEWS"
|
||||
distfiles="https://github.com/void-linux/xbps/archive/${version}.tar.gz"
|
||||
checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
|
||||
patch_args=-Np1
|
||||
|
||||
hostmakedepends="pkgconf"
|
||||
checkdepends="kyua"
|
||||
|
|
Loading…
Reference in New Issue