moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

libucontext: update to 1.0

Browse source
This commit is contained in:
q66 2021-01-09 19:06:04 +01:00
parent 40004c865e
commit 4aa3de803b
3 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/shlibs
View file

@ -2438,7 +2438,8 @@ libgemini.so.17 calligra-gemini-3.2.0_1
libarpack.so.2 arpack-ng-3.3.0_2 libarpack.so.2 arpack-ng-3.3.0_2
libfts.so.0 musl-fts-1.2_2 libfts.so.0 musl-fts-1.2_2
libobstack.so.1 musl-obstack-1.2.1_1 libobstack.so.1 musl-obstack-1.2.1_1
libucontext.so.0 libucontext-0.1.1_1 libucontext.so.1 libucontext-1.0_1
libucontext_posix.so.1 libucontext-1.0_1
libgavl.so.1 gavl-1.40_1 libgavl.so.1 gavl-1.40_1
libmxml.so.1 mxml-2.9_1 libmxml.so.1 mxml-2.9_1
libKF5Pty.so.5 kpty-5.26.0_1 libKF5Pty.so.5 kpty-5.26.0_1

20
srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
View file

@ -1,20 +0,0 @@
--- arch/x86/startcontext.S 2020-05-18 05:28:21.000000000 +0200
+++ arch/x86/startcontext.S 2021-01-02 23:52:32.728187160 +0100
@@ -18,7 +18,7 @@
cmpl $0, (%esp)
/* restore global offset table, exit@plt and __setcontext@plt need this */
- call __i686.get_pc_thunk.bx
+ call i686_get_pc_thunk_bx
addl $_GLOBAL_OFFSET_TABLE_, %ebx
/* if we have no linked context, lets get out of here */
@@ -35,7 +35,7 @@
/* something is really hosed, call hlt to force termination */
hlt
-__i686.get_pc_thunk.bx:
+i686_get_pc_thunk_bx:
mov (%esp), %ebx
ret
END(__start_context)

37
srcpkgs/libucontext/template
View file

@ -1,8 +1,7 @@
# Template file for 'libucontext' # Template file for 'libucontext'
pkgname=libucontext pkgname=libucontext
reverts="0.13.1_1" version=1.0
version=0.11 revision=1
revision=2
archs="*-musl" archs="*-musl"
wrksrc="${pkgname}-${pkgname}-${version}" wrksrc="${pkgname}-${pkgname}-${version}"
short_desc="Compatibility layer providing ucontext functions" short_desc="Compatibility layer providing ucontext functions"
@ -10,27 +9,37 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="ISC" license="ISC"
homepage="https://github.com/kaniini/libucontext" homepage="https://github.com/kaniini/libucontext"
distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz" distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
checksum=ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb checksum=23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb
case "${XBPS_TARGET_MACHINE}" in case "${XBPS_TARGET_MACHINE}" in
arm*) export LIBUCONTEXT_ARCH="arm";; x86_64*) _luctx_arch="x86_64" ;;
i686*) export LIBUCONTEXT_ARCH="x86";; i686*) _luctx_arch="x86" ;;
ppc64*) export LIBUCONTEXT_ARCH="ppc64";; aarch64*) _luctx_arch="aarch64" ;;
ppc*) export LIBUCONTEXT_ARCH="ppc";; arm*) _luctx_arch="arm" ;;
mips*) export LIBUCONTEXT_ARCH="mips";; ppc64*) _luctx_arch="ppc64" ;;
*) export LIBUCONTEXT_ARCH="${XBPS_TARGET_MACHINE%%-musl}";; ppc*) _luctx_arch="ppc" ;;
mips*64*) _luctx_arch="mips64" ;;
mips*) _luctx_arch="mips" ;;
riscv64*) _luctx_arch="riscv64" ;;
s390x*) _luctx_arch="s390x" ;;
*) broken="libucontext not available for ${XBPS_TARGET_MACHINE}";;
esac esac
# we provide our own CFLAGS, which overwrite all of theirs
export CFLAGS=" -DEXPORT_UNPREFIXED"
do_build() { do_build() {
make ARCH="${LIBUCONTEXT_ARCH}" make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
} }
do_check() { do_check() {
make ARCH="${LIBUCONTEXT_ARCH}" check make ARCH="${_luctx_arch}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" check
} }
do_install() { do_install() {
make ARCH="${LIBUCONTEXT_ARCH}" DESTDIR="${DESTDIR}/usr" install make ARCH="${_luctx_arch}" DESTDIR="${DESTDIR}" LIBDIR="/usr/lib" install
# missing from release?
ln -s libucontext_posix.so.1 ${DESTDIR}/usr/lib/libucontext_posix.so
} }
post_install() { post_install() {
@ -41,6 +50,8 @@ libucontext-devel_package() {
depends="libucontext>=${version}_${revision}" depends="libucontext>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove "usr/lib/*.a" vmove "usr/lib/*.a"
} }