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

rpi-userland: update to 20210110.

Browse source 
Make rpaths relative to allow proper function inside, e.g., a
multilib root; also, drop unneded dynamic linker configs (which are a
bad idea on musl anyway).
This commit is contained in:
Andrew J. Hesford 2021-01-10 21:18:53 -05:00
parent 8184fc462b
commit 3b48183232
2 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
srcpkgs/rpi-userland/INSTALL
View file

@ -1,7 +0,0 @@
case "$ACTION" in
post)
if [ -x sbin/ldconfig ]; then
sbin/ldconfig -X || :
fi
;;
esac

19
srcpkgs/rpi-userland/template
View file

@ -1,20 +1,20 @@
# Template file for 'rpi-userland' # Template file for 'rpi-userland'
_githash="06bc6daa02137ca72b7a2104afad81e82a44de17" _githash="093b30bbc2fd083d68cc3ee07e6e555c6e592d11"
_gitshort="${_githash:0:7}" _gitshort="${_githash:0:7}"
pkgname=rpi-userland pkgname=rpi-userland
version=20191218 version=20210110
revision=1 revision=1
wrksrc="userland-${_githash}" wrksrc="userland-${_githash}"
build_style=cmake build_style=cmake
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
configure_args="-DCMAKE_INSTALL_RPATH=/opt/vc/lib" configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})" short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://github.com/raspberrypi/userland" homepage="https://github.com/raspberrypi/userland"
distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz" distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
checksum=cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 checksum=b23fc0849d282a8ba27b821cb8f63fa2ebc2ae8aa3cba0664ce3809ea814507b
LDFLAGS="-Wl,--no-as-needed" LDFLAGS="-Wl,--no-as-needed"
archs="armv6l* armv7l* aarch64*" archs="armv6l* armv7l* aarch64*"
@ -55,17 +55,6 @@ post_install() {
vlicense LICENCE vlicense LICENCE
rm -rf ${DESTDIR}/etc rm -rf ${DESTDIR}/etc
rm -rf ${DESTDIR}/opt/vc/share rm -rf ${DESTDIR}/opt/vc/share
case "$XBPS_TARGET_MACHINE" in
*-musl)
vmkdir etc
echo /lib:/usr/local/lib:/usr/lib:/opt/vc/lib > ${DESTDIR}/etc/ld-musl-armhf.path
;;
*)
vmkdir etc/ld.so.conf.d
echo /opt/vc/lib > ${DESTDIR}/etc/ld.so.conf.d/rpi-userland.conf
;;
esac
} }
rpi-userland-devel_package() { rpi-userland-devel_package() {