cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update plan9port to a newer snapshot 

fixes clang 11 / default -fno-common build
ok gsoares@ kn@
This commit is contained in:
jsg 2021-01-30 12:51:34 +00:00
parent 55c848aaf5
commit 52802352c7
9 changed files with 42 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plan9/plan9port/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2020/11/16 23:56:37 gsoares Exp $
# $OpenBSD: Makefile,v 1.37 2021/01/30 12:51:34 jsg Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc
BROKEN-i386 = various "invalid operand for instruction", OpenBSD-386-asm.S
@ -6,11 +6,11 @@ BROKEN-powerpc = threading issues
COMMENT = Plan 9 from user space
DISTNAME = plan9port-20200927
DISTNAME = plan9port-20210129
GH_ACCOUNT = 9fans
GH_PROJECT = plan9port
GH_COMMIT = 291f7411783bf6871b253f3b15ce691eea7a257e
GH_COMMIT = 36cd4c58c1346375b98f517fb8568be5bb47618d
CATEGORIES = plan9
@ -33,10 +33,6 @@ NO_TEST = Yes
SUBST_VARS += CC
UPDATE_PLIST_ARGS += -i CC
post-patch:
cd ${WRKSRC}/src/libthread && mv OpenBSD-386-asm.s \
OpenBSD-386-asm.S
pre-configure:
${SUBST_CMD} ${WRKSRC}/INSTALL ${WRKSRC}/bin/{9c,9l}
cd ${WRKSRC} && sed -i 's,#!/bin/bash,#!/bin/sh,' \

4
plan9/plan9port/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (plan9port-20200927-291f7411.tar.gz) = TbkO14WQZtJqQk6944sxi7YDCtkgnNv7T1+zL7SGplk=
SIZE (plan9port-20200927-291f7411.tar.gz) = 23446639
SHA256 (plan9port-20210129-36cd4c58.tar.gz) = 1PqRIaFCHx0GWU4Mh3eiE5LKa9i3OwtdTUlZhD7/3AI=
SIZE (plan9port-20210129-36cd4c58.tar.gz) = 23416712

10
plan9/plan9port/patches/patch-INSTALL
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-INSTALL,v 1.8 2020/06/21 20:37:20 gsoares Exp $
$OpenBSD: patch-INSTALL,v 1.9 2021/01/30 12:51:34 jsg Exp $
Index: INSTALL
--- INSTALL.orig
+++ INSTALL
@@ -118,7 +118,7 @@ fi
@@ -102,7 +102,7 @@ fi
if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available.
rm -f a.out
@ -12,7 +12,7 @@ Index: INSTALL
-I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
if [ -f a.out ]; then
@@ -144,7 +144,7 @@ echo "* Compiler version:"
@@ -128,7 +128,7 @@ echo "* Compiler version:"
cd src
if $dobuild; then
echo "* Building mk..."
@ -21,7 +21,7 @@ Index: INSTALL
if [ ! -x ../bin/mk ]; then
echo "* Error: mk failed to build."
@@ -152,7 +152,6 @@ if $dobuild; then
@@ -136,7 +136,6 @@ if $dobuild; then
fi
echo "* Building everything (be patient)..."
@ -29,7 +29,7 @@ Index: INSTALL
mk libs-nuke
mk all || exit 1
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then
@@ -211,5 +210,5 @@ if $doinstall; then
@@ -195,5 +194,5 @@ if $doinstall; then
echo " PLAN9=$PLAN9 export PLAN9"
echo ' PATH=$PATH:$PLAN9/bin export PATH'
fi

4
plan9/plan9port/patches/patch-bin_9c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bin_9c,v 1.3 2020/06/21 20:37:20 gsoares Exp $
$OpenBSD: patch-bin_9c,v 1.4 2021/01/30 12:51:34 jsg Exp $
Index: bin/9c
--- bin/9c.orig
+++ bin/9c
@ -11,7 +11,7 @@ Index: bin/9c
cflags=" \
-O2 \
-c \
@@ -64,7 +64,7 @@ quiet()
@@ -60,7 +60,7 @@ quiet()
useclang()
{

4
plan9/plan9port/patches/patch-bin_9l
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-bin_9l,v 1.2 2020/06/21 20:37:20 gsoares Exp $
$OpenBSD: patch-bin_9l,v 1.3 2021/01/30 12:51:34 jsg Exp $
Index: bin/9l
--- bin/9l.orig
+++ bin/9l
@@ -12,7 +12,7 @@ extralibs="-lm"
tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
tag="${SYSNAME:-`uname`}"
case "$tag" in
*DragonFly*|*BSD*)
- ld="${CC9:-gcc} $CC9FLAGS"

20
plan9/plan9port/patches/patch-src_libsec_386_mkfile
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_libsec_386_mkfile,v 1.1 2019/08/31 14:09:13 sthen Exp $
Index: src/libsec/386/mkfile
--- src/libsec/386/mkfile.orig
+++ src/libsec/386/mkfile
@@ -1,4 +1,5 @@
<$PLAN9/src/mkhdr
+CC?=cc
LIB=libsec.a
SFILES=\
@@ -18,7 +19,7 @@ UPDATE=mkfile\
%.s: %.spp
if [ `uname` = OpenBSD ] || [ `uname` = Darwin ]
then
- gcc -xc -D__`uname`__ -E $stem.spp >$stem.s
+ ${CC} -xc -D__`uname`__ -E $stem.spp >$stem.s
else
cpp $stem.spp >$stem.s
fi

14
plan9/plan9port/patches/patch-src_libthread_daemonize_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_libthread_daemonize_c,v 1.1 2021/01/30 12:51:34 jsg Exp $
Index: src/libthread/daemonize.c
--- src/libthread/daemonize.c.orig
+++ src/libthread/daemonize.c
@@ -106,7 +106,7 @@ _threadsetupdaemonize(void)
* Put it in its own process group so that we don't get a SIGHUP
* when the parent exits.
*/
- setpgrp();
+ setpgid(0, 0);
if(pipe(p) < 0)
sysfatal("passer pipe: %r");

4
plan9/plan9port/patches/patch-src_mkhdr
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_mkhdr,v 1.3 2020/06/21 20:37:20 gsoares Exp $
$OpenBSD: patch-src_mkhdr,v 1.4 2021/01/30 12:51:34 jsg Exp $
Index: src/mkhdr
--- src/mkhdr.orig
+++ src/mkhdr
@@ -11,8 +11,8 @@ CC=9c
LD=9l
AS=9a
AS=no-9a
AR=9ar
-CFLAGS=
-LDFLAGS=

99
plan9/plan9port/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2020/11/17 00:04:59 gsoares Exp $
@comment $OpenBSD: PLIST,v 1.15 2021/01/30 12:51:34 jsg Exp $
@unexec-delete rm -f ${PREFIX}/plan9/man/whatis.db
bin/9
plan9/
@ -40,7 +40,6 @@ plan9/bin/""
plan9/bin/9
plan9/bin/9.rc
@bin plan9/bin/9660srv
plan9/bin/9a
plan9/bin/9ar
plan9/bin/9c
plan9/bin/9fs
@ -6292,13 +6291,10 @@ plan9/src/cmd/rio/xevents.c
plan9/src/cmd/rio/xshove.c
plan9/src/cmd/rm.c
plan9/src/cmd/sam/
plan9/src/cmd/sam/README
plan9/src/cmd/sam/_libc.h
plan9/src/cmd/sam/address.c
plan9/src/cmd/sam/buff.c
plan9/src/cmd/sam/cmd.c
plan9/src/cmd/sam/disk.c
plan9/src/cmd/sam/err
plan9/src/cmd/sam/error.c
plan9/src/cmd/sam/errors.h
plan9/src/cmd/sam/file.c
@ -6310,7 +6306,6 @@ plan9/src/cmd/sam/mkfile
plan9/src/cmd/sam/moveto.c
plan9/src/cmd/sam/multi.c
plan9/src/cmd/sam/parse.h
plan9/src/cmd/sam/plan9.c
plan9/src/cmd/sam/plumb.h
plan9/src/cmd/sam/rasp.c
plan9/src/cmd/sam/regexp.c
@ -7484,26 +7479,6 @@ plan9/src/libmemlayer/ltorear.c
plan9/src/libmemlayer/mkfile
plan9/src/libmemlayer/unload.c
plan9/src/libmp/
plan9/src/libmp/386/
plan9/src/libmp/386/mkfile
plan9/src/libmp/386/mpdigdiv-Darwin.s
plan9/src/libmp/386/mpdigdiv.s
plan9/src/libmp/386/mpvecadd-Darwin.s
plan9/src/libmp/386/mpvecadd.s
plan9/src/libmp/386/mpvecdigmuladd-Darwin.s
plan9/src/libmp/386/mpvecdigmuladd.s
plan9/src/libmp/386/mpvecdigmulsub-Darwin.s
plan9/src/libmp/386/mpvecdigmulsub.s
plan9/src/libmp/386/mpvecsub-Darwin.s
plan9/src/libmp/386/mpvecsub.s
plan9/src/libmp/PowerMacintosh/
plan9/src/libmp/PowerMacintosh/mkfile
plan9/src/libmp/arm/
plan9/src/libmp/arm/mkfile
plan9/src/libmp/arm64/
plan9/src/libmp/arm64/mkfile
plan9/src/libmp/mips/
plan9/src/libmp/mips/mkfile
plan9/src/libmp/mkfile
plan9/src/libmp/port/
plan9/src/libmp/port/betomp.c
@ -7543,14 +7518,6 @@ plan9/src/libmp/port/os.h
plan9/src/libmp/port/portdate
plan9/src/libmp/port/reduce
plan9/src/libmp/port/strtomp.c
plan9/src/libmp/power/
plan9/src/libmp/power/mkfile
plan9/src/libmp/sparc64/
plan9/src/libmp/sparc64/mkfile
plan9/src/libmp/sun4u/
plan9/src/libmp/sun4u/mkfile
plan9/src/libmp/x86_64/
plan9/src/libmp/x86_64/mkfile
plan9/src/libmux/
plan9/src/libmux/COPYRIGHT
plan9/src/libmux/io.c
@ -7606,18 +7573,6 @@ plan9/src/libregexp/rregsub.c
plan9/src/libregexp/test.c
plan9/src/libregexp/test2.c
plan9/src/libsec/
plan9/src/libsec/386/
plan9/src/libsec/386/md5block.spp
plan9/src/libsec/386/mkfile
plan9/src/libsec/386/sha1block.spp
plan9/src/libsec/PowerMacintosh/
plan9/src/libsec/PowerMacintosh/mkfile
plan9/src/libsec/arm/
plan9/src/libsec/arm/mkfile
plan9/src/libsec/arm64/
plan9/src/libsec/arm64/mkfile
plan9/src/libsec/mips/
plan9/src/libsec/mips/mkfile
plan9/src/libsec/mkfile
plan9/src/libsec/port/
plan9/src/libsec/port/aes.c
@ -7680,14 +7635,6 @@ plan9/src/libsec/port/smallprimetest.c
plan9/src/libsec/port/thumb.c
plan9/src/libsec/port/tlshand.c
plan9/src/libsec/port/x509.c
plan9/src/libsec/power/
plan9/src/libsec/power/mkfile
plan9/src/libsec/sparc64/
plan9/src/libsec/sparc64/mkfile
plan9/src/libsec/sun4u/
plan9/src/libsec/sun4u/mkfile
plan9/src/libsec/x86_64/
plan9/src/libsec/x86_64/mkfile
plan9/src/libsunrpc/
plan9/src/libsunrpc/COPYING
plan9/src/libsunrpc/authunix.c
@ -7707,19 +7654,8 @@ plan9/src/libsunrpc/server.c
plan9/src/libsunrpc/suncall.c
plan9/src/libsunrpc/udp.c
plan9/src/libthread/
plan9/src/libthread/386-ucontext.c
plan9/src/libthread/386-ucontext.h
plan9/src/libthread/COPYING.SPARC64-CONTEXT
plan9/src/libthread/COPYRIGHT
plan9/src/libthread/Linux-arm-asm.s
plan9/src/libthread/Linux-sparc64-context.S
plan9/src/libthread/NetBSD-386-asm.s
plan9/src/libthread/NetBSD-power-asm.s
plan9/src/libthread/NetBSD.c
plan9/src/libthread/OpenBSD-386-asm.S
plan9/src/libthread/OpenBSD-power-asm.S
plan9/src/libthread/OpenBSD-x86_64-asm.S
plan9/src/libthread/arm-ucontext.c
plan9/src/libthread/bg.c
plan9/src/libthread/channel.c
plan9/src/libthread/daemonize.c
plan9/src/libthread/exec.c
@ -7727,14 +7663,8 @@ plan9/src/libthread/ioproc.c
plan9/src/libthread/ioproc.h
plan9/src/libthread/iorw.c
plan9/src/libthread/mkfile
plan9/src/libthread/power-ucontext.c
plan9/src/libthread/power-ucontext.h
plan9/src/libthread/pthread.c
plan9/src/libthread/ref.c
plan9/src/libthread/sparc64-ucontext.c
plan9/src/libthread/stkmalloc.c
plan9/src/libthread/stkmmap.c
plan9/src/libthread/sysofiles.sh
plan9/src/libthread/test/
plan9/src/libthread/test/mkfile
plan9/src/libthread/test/pthreadloop.c
@ -7749,8 +7679,6 @@ plan9/src/libthread/test/tspawnloop.c
plan9/src/libthread/thread.c
plan9/src/libthread/threadimpl.h
plan9/src/libthread/wait.c
plan9/src/libthread/x86_64-ucontext.c
plan9/src/libthread/x86_64-ucontext.h
plan9/src/libventi/
plan9/src/libventi/cache.acid
plan9/src/libventi/cache.c
@ -8001,19 +7929,16 @@ plan9/unix/README
plan9/unix/README.dot
plan9/unix/fmt.h
plan9/unix/make/
plan9/unix/make/Make.Darwin-386
plan9/unix/make/Make.Darwin-PowerMacintosh
plan9/unix/make/Make.FreeBSD-386
plan9/unix/make/Make.HP-UX-9000
plan9/unix/make/Make.Linux-386
plan9/unix/make/Make.Linux-power
plan9/unix/make/Make.Linux-x86_64
plan9/unix/make/Make.NetBSD-386
plan9/unix/make/Make.OSF1-alpha
plan9/unix/make/Make.OpenBSD-386
plan9/unix/make/Make.SunOS-sun4u
plan9/unix/make/Make.SunOS-sun4u-cc
plan9/unix/make/Make.SunOS-sun4u-gcc
plan9/unix/make/Make.Darwin
plan9/unix/make/Make.FreeBSD
plan9/unix/make/Make.HP-UX
plan9/unix/make/Make.Linux
plan9/unix/make/Make.NetBSD
plan9/unix/make/Make.OSF1
plan9/unix/make/Make.OpenBSD
plan9/unix/make/Make.SunOS
plan9/unix/make/Make.SunOS-cc
plan9/unix/make/Make.SunOS-gcc
plan9/unix/make/Makefile.BOT
plan9/unix/make/Makefile.CMD
plan9/unix/make/Makefile.LIB