From 123e413f3230a29f69212d8d42cd4b3cb25437ad Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Sat, 14 Mar 2020 18:58:55 +0000 Subject: [PATCH] plan9port: update to 20200222. --- srcpkgs/plan9port/patches/linux5.patch | 24 ------------------------ srcpkgs/plan9port/template | 9 ++++----- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/plan9port/patches/linux5.patch diff --git a/srcpkgs/plan9port/patches/linux5.patch b/srcpkgs/plan9port/patches/linux5.patch deleted file mode 100644 index dcf42370a6b..00000000000 --- a/srcpkgs/plan9port/patches/linux5.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 81268c62d35f4b4bc226a4916a8354764b1f5853 Mon Sep 17 00:00:00 2001 -From: Ivy Foster -Date: Sat, 18 May 2019 14:25:01 -0500 -Subject: [PATCH] 9l: Update and near-future-proof Linux version check - ---- - bin/9l | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git bin/9l bin/9l -index 6195815f7..d03b4760e 100755 ---- bin/9l -+++ bin/9l -@@ -40,7 +40,9 @@ case "$tag" in - userpath=true - extralibs="$extralibs -lutil -lresolv" - case "${SYSVERSION:-`uname -r`}" in -- 2.6.* | 3.* | 4.*) -+ # Assuming that versions change more often than the name of -+ # the threading library, this should save some future updates. -+ 2.6.* | [3-9].* | [1-9][0-9].*) - extralibs="$extralibs -lpthread" - ;; - esac diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template index ec931b1b7d6..978ec24105f 100644 --- a/srcpkgs/plan9port/template +++ b/srcpkgs/plan9port/template @@ -1,8 +1,8 @@ # Template file for 'plan9port' pkgname=plan9port -version=20190619 +version=20200222 revision=1 -_githash=e995a0c101863688d5f14649ae3de45a7c43789c +_githash=92aa0e13ad8cec37936998a66eb728bfca88d689 archs="i686* x86_64* ppc*" wrksrc="${pkgname}-${_githash}" hostmakedepends="perl" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="LPL-1.02" homepage="https://9fans.github.io/plan9port/" distfiles="https://github.com/9fans/plan9port/archive/${_githash}.tar.gz" -checksum=639e0bb01728ffd7cc1751eeb1bfc7314615d88d6fa7f4cde21033ad97622624 +checksum=606840c59de9a3a6c447f381df21eeba57d3a6c9799af83877d43541a372497c nocross=yes if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then @@ -28,7 +28,6 @@ post_extract() { -i src/cmd/faces/mkfile \ -i src/cmd/mkfile vsed -e 's/-lX11$/& $LDFLAGS/g' -i src/cmd/rio/mkfile - vsed -e '1i#include ' -i lib/linux-isnptl.c } do_build() { CFLAGS+=' -D_DEFAULT_SOURCE' @@ -37,7 +36,7 @@ do_build() { vsed -e 's/-O2/$CFLAGS/' -i bin/9c if [[ $XBPS_TARGET_MACHINE == *-musl ]]; then # add libucontext to extralibs under linux - vsed -e '/^\textralibs=.*-lresolv"$/s/"$/ -lucontext"/' -i bin/9l + vsed -e '/^\textralibs=.*-lpthread"$/s/"$/ -lucontext"/' -i bin/9l fi ./INSTALL