From f73e0a943dcfe5b0ec67119287970dc30bfde11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 17 Nov 2021 23:49:15 -0300 Subject: [PATCH] go1.12-bootstrap: remove outdated musl workaround. Since 091ab0b612d039891f4d549f9f054567bcef3627, we have /lib64 as a symlink to /usr/lib on 64-bit systems, so patching the ELF file to change its interpreter is no longer necessary. --- srcpkgs/go1.12-bootstrap/template | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template index 2b3c298cb92..9d6c3b4b3cb 100644 --- a/srcpkgs/go1.12-bootstrap/template +++ b/srcpkgs/go1.12-bootstrap/template @@ -1,7 +1,7 @@ # Template file for 'go1.12-bootstrap' pkgname=go1.12-bootstrap version=1.12.17 -revision=1 +revision=2 archs="x86_64* i686* armv[67]l* aarch64* ppc64le*" wrksrc="go" short_desc="Go 1.12 (bootstrap compiler)" @@ -15,7 +15,6 @@ lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = "musl" ]; then depends+=" gcompat" - hostmakedepends+=" patchelf" fi case "$XBPS_TARGET_MACHINE" in @@ -43,18 +42,6 @@ esac distfiles="https://dl.google.com/go/go${version}.linux-${_dist_arch}.tar.gz" -post_build() { - [ "$XBPS_TARGET_LIBC" != "musl" ] && return 0 - - # we don't have lib64 compatibility path on musl 64-bit systems - # use patchelf to replace /lib64/ with /lib/ - - local _interp=$(patchelf --print-interpreter ${wrksrc}/bin/go) - - patchelf --set-interpreter ${_interp/lib64\//lib\/} ${wrksrc}/bin/go - patchelf --set-interpreter ${_interp/lib64\//lib\/} ${wrksrc}/bin/godoc -} - do_install() { vmkdir usr/lib/go1.12 vcopy bin usr/lib/go1.12