mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-29 08:52:56 +02:00
gcompat: update to 0.4.0, add libucontext option, fix on ppc*
Libucontext is off on MIPS as it's not supported by libucontext itself.
This commit is contained in:
parent
ccafc2a781
commit
ef40164786
2 changed files with 87 additions and 4 deletions
67
srcpkgs/gcompat/patches/ppc-libc_start_main.patch
Normal file
67
srcpkgs/gcompat/patches/ppc-libc_start_main.patch
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
From d30e49d10cefeb2748373127e1d1aba1184f653d Mon Sep 17 00:00:00 2001
|
||||||
|
From: q66 <daniel@octaforge.org>
|
||||||
|
Date: Sun, 10 Nov 2019 15:32:28 +0100
|
||||||
|
Subject: [PATCH 1/1] internal: add a wrapper for __libc_start_main for
|
||||||
|
PowerPC(64(le))
|
||||||
|
|
||||||
|
This is necessary because the musl and glibc function signatures
|
||||||
|
differ significantly.
|
||||||
|
---
|
||||||
|
libgcompat/internal.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 41 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libgcompat/internal.c b/libgcompat/internal.c
|
||||||
|
index 450c5e4..53ac429 100644
|
||||||
|
--- libgcompat/internal.c
|
||||||
|
+++ libgcompat/internal.c
|
||||||
|
@@ -2,6 +2,47 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
+#if defined(__powerpc__)
|
||||||
|
+
|
||||||
|
+/* On PowerPC as well as ppc64, we need to fix up __libc_start_main as the
|
||||||
|
+ * glibc and musl versions have wildly different signatures, which would
|
||||||
|
+ * result in the arguments to __libc_start_main being completely wrong.
|
||||||
|
+ *
|
||||||
|
+ * Using dlsym in this context is mildly questionable as this is before
|
||||||
|
+ * the full initialization has been done, but there is no better way.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <dlfcn.h>
|
||||||
|
+
|
||||||
|
+struct startup_info {
|
||||||
|
+ void *sda_base;
|
||||||
|
+ void *f_main;
|
||||||
|
+ void *f_init;
|
||||||
|
+ void *f_fini;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+typedef int (*start_main_t)(void *mf, int argc, char **argv);
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * ref: https://git.musl-libc.org/cgit/musl/tree/crt/crt1.c?id=90251cf
|
||||||
|
+ * ref: https://git.musl-libc.org/cgit/musl/tree/src/env/__libc_start_main.c?id=90251cf#n71
|
||||||
|
+ * ref: https://github.com/bminor/glibc/blob/5cb226d/sysdeps/unix/sysv/linux/powerpc/libc-start.c#L36
|
||||||
|
+ */
|
||||||
|
+int __libc_start_main(void *argc, void *argv, void *ev, void *auxv, void *fini,
|
||||||
|
+ struct startup_info *si, long *p)
|
||||||
|
+{
|
||||||
|
+ (void)argc;
|
||||||
|
+ (void)argv;
|
||||||
|
+ (void)ev;
|
||||||
|
+ (void)auxv;
|
||||||
|
+ (void)fini;
|
||||||
|
+ /* argc/argv from the stack, main from startup_info */
|
||||||
|
+ start_main_t mainf = (start_main_t)dlsym(RTLD_NEXT, "__libc_start_main");
|
||||||
|
+ return mainf(si->f_main, *p, (void *)(p + 1));
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#endif /* defined(__powerpc__) */
|
||||||
|
+
|
||||||
|
void GCOMPAT__panic(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list va;
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'gcompat'
|
# Template file for 'gcompat'
|
||||||
pkgname=gcompat
|
pkgname=gcompat
|
||||||
version=0.3.0
|
version=0.4.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
short_desc="Compatibility layer to allow running glibc binaries on musl systems"
|
short_desc="Compatibility layer to allow running glibc binaries on musl systems"
|
||||||
|
@ -8,7 +8,15 @@ maintainer="Daniel James <djames@orcadian.net>"
|
||||||
license="ISC"
|
license="ISC"
|
||||||
homepage="https://code.foxkit.us/adelie/gcompat"
|
homepage="https://code.foxkit.us/adelie/gcompat"
|
||||||
distfiles="https://distfiles.AdelieLinux.org/source/${pkgname}/${pkgname}-${version}.tar.xz"
|
distfiles="https://distfiles.AdelieLinux.org/source/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=31bb3ead012e23a1f3b4bedc8a376655d3b65c66d37e6acc865a9b72163f50ea
|
checksum=9903fac7b70de3ba7736ae2987fa00bbafff7bfcf6a9c88731c292dff19e44e2
|
||||||
|
|
||||||
|
build_options="libucontext"
|
||||||
|
desc_option_libucontext="Build with ucontext support via libucontext"
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
mips*) ;;
|
||||||
|
*) build_options_default+=" libucontext" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
# https://sourceware.org/glibc/wiki/ABIList
|
# https://sourceware.org/glibc/wiki/ABIList
|
||||||
# https://wiki.linaro.org/RikuVoipio/LdSoTable
|
# https://wiki.linaro.org/RikuVoipio/LdSoTable
|
||||||
|
@ -28,14 +36,22 @@ case "${XBPS_TARGET_MACHINE}" in
|
||||||
x86_64-musl) _glibc="ld-linux-x86-64.so.2" _musl="ld-musl-x86_64.so.1";;
|
x86_64-musl) _glibc="ld-linux-x86-64.so.2" _musl="ld-musl-x86_64.so.1";;
|
||||||
ppc64le-musl) _glibc="ld64.so.2" _musl="ld-musl-powerpc64le.so.1";;
|
ppc64le-musl) _glibc="ld64.so.2" _musl="ld-musl-powerpc64le.so.1";;
|
||||||
ppc64-musl) _glibc="ld64.so.2" _musl="ld-musl-powerpc64.so.1";;
|
ppc64-musl) _glibc="ld64.so.2" _musl="ld-musl-powerpc64.so.1";;
|
||||||
|
ppc-musl) _glibc="ld.so.1" _musl="ld-musl-powerpc.so.1";;
|
||||||
*-musl) broken="Template does not yet recognize this arch, please fix";;
|
*-musl) broken="Template does not yet recognize this arch, please fix";;
|
||||||
*) broken="Only for musl libc";;
|
*) broken="Only for musl libc";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
make_build_args="LINKER_PATH=/usr/lib/${_musl} LOADER_NAME=${_glibc}
|
make_build_args="LINKER_PATH=/usr/lib/${_musl} LOADER_NAME=${_glibc}
|
||||||
LIBGCOMPAT_PATH=/usr/lib/libgcompat.so.0 LOADER_PATH=/usr/lib/${LOADER_NAME}"
|
LIBGCOMPAT_PATH=/usr/lib/libgcompat.so.0 LOADER_PATH=/usr/lib/${LOADER_NAME}
|
||||||
|
WITH_OBSTACK=no"
|
||||||
make_install_args="LINKER_PATH=/usr/lib/${_musl} LOADER_NAME=${_glibc}
|
make_install_args="LINKER_PATH=/usr/lib/${_musl} LOADER_NAME=${_glibc}
|
||||||
LIBGCOMPAT_PATH=/usr/lib/libgcompat.so.0 LOADER_PATH=/usr/lib/${LOADER_NAME}"
|
LIBGCOMPAT_PATH=/usr/lib/libgcompat.so.0 LOADER_PATH=/usr/lib/${LOADER_NAME}
|
||||||
|
WITH_OBSTACK=no"
|
||||||
|
|
||||||
|
if [ "$build_option_libucontext" ]; then
|
||||||
|
makedepends+=" libucontext-devel"
|
||||||
|
make_build_args+=" WITH_LIBUCONTEXT=1"
|
||||||
|
fi
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENSE
|
vlicense LICENSE
|
||||||
|
|
Loading…
Add table
Reference in a new issue