Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 3B9D4780004 for ; Mon, 7 Oct 2019 22:34:03 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id m19so12482404otp.1 for ; Mon, 07 Oct 2019 15:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QSKoziWXAOiZTdiz0GPCGLdcOznj2ZTdu4X0N4Ur1So=; b=icuHg9/xql4BT5d7xIvrZ4x5E3ufYraaYwjqK3f9b3yy8BagLpa8/s5b0dBDG5bYNl MSNkKVlW1ipZ9t3AjF6GUBajSazSMbcVZNfPTGMB2cIVL0MVbVPR8fITZap3N7H8XAG/ hIrD4olT0wWDK4xYAGkJiIl3tVxOyD5riA8NPNuK6hIzGALTLvIDFOGVtqRVF/uQckJe 7+QodbxHgRS//mGPxL+gfOlpH47awIVk0qve+vivT0yuVzsoNfFQukUViqv9R9E82gY7 u9Xi1wYwApgCAexDGQEYvf4QENG/Pj6/w0usRaJEfRZO5GGeuuiUj/GHRPKtcSxpMLEG QzNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QSKoziWXAOiZTdiz0GPCGLdcOznj2ZTdu4X0N4Ur1So=; b=m8LFDnVPpIpMu8aXeGqXRxa+z+97I6FoAGUBy3fIij0Qc6+fcdBxekLf8XkPMsttHv zN7hGEKQlCnU3cKd3FqRykQrqhW6UziWWy500dNQTMp0wAHUTZz0OD5YpdblVUeGV9tS Vp1pwtah2X5GYhbRju4h2uZfdefsrz++gCJqAruZ9HzWiUbepRR1djr/VzNadWTrQPkl xDfHJ7VoP/7K+V8M06p46yK0sjOC40TmSiNVyQ2FPd/6EOWJej9Vg+C3DB+e+IWu9rDd zAq1eW9Cvt7Zaq2BOWRDl8YQgDDdGwatUS+fR2qEEhnSmp+VxMa3SQW/PO0FLcHDdRtc cqpg== X-Gm-Message-State: APjAAAXBRFXNttIfYosh2+GUiHLb4+fSVM+Rl6dbxqndk3Z7PjhtrQHC 4+MOcfWMRIJsYJidkj33tljCE+Bn8gI= X-Google-Smtp-Source: APXvYqxd+zhZ4oIabX+4mOrdxi1VjUCK/YaoxbjKaqtd3xfd9wQSc/pus3AQdDj0Xyy3LgqzkDt25Q== X-Received: by 2002:a9d:3782:: with SMTP id x2mr10361047otb.235.1570487640730; Mon, 07 Oct 2019 15:34:00 -0700 (PDT) Received: from localhost ([2806:107e:8:39b:7928:397c:6eca:ac3e]) by smtp.gmail.com with ESMTPSA id n27sm4626722otr.32.2019.10.07.15.33.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Oct 2019 15:33:59 -0700 (PDT) From: Joshua Haase To: alpine-aports@lists.alpinelinux.org Cc: Joshua Haase Subject: [PATCH v2] testing/9base: new aport Date: Mon, 7 Oct 2019 17:33:41 -0500 Message-Id: <20191007223341.32715-1-hahj87@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191006063956.23935-1-hahj87@gmail.com> References: <20191006063956.23935-1-hahj87@gmail.com> Closes #10855, see !299 The port for s390x is as recommended on https://plan9port-review.googlesource.com/1030 --- - Fixed lint problems. - Added config.mk for all architectures, and a patch for s390x. - Passed tests on https://gitlab.alpinelinux.org/alpine/aports/merge_requests/299 testing/9base/APKBUILD | 48 +++++++++++++++++++++++++++++++++ testing/9base/config.mk.i686 | 24 +++++++++++++++++ testing/9base/config.mk.ppc64le | 22 +++++++++++++++ testing/9base/config.mk.s390x | 22 +++++++++++++++ testing/9base/config.mk.x86_64 | 24 +++++++++++++++++ testing/9base/dirread.patch | 17 ++++++++++++ testing/9base/s390x.patch | 10 +++++++ 7 files changed, 167 insertions(+) create mode 100644 testing/9base/APKBUILD create mode 100644 testing/9base/config.mk.i686 create mode 100644 testing/9base/config.mk.ppc64le create mode 100644 testing/9base/config.mk.s390x create mode 100644 testing/9base/config.mk.x86_64 create mode 100644 testing/9base/dirread.patch create mode 100644 testing/9base/s390x.patch diff --git a/testing/9base/APKBUILD b/testing/9base/APKBUILD new file mode 100644 index 0000000000..ddecc8c6b1 --- /dev/null +++ b/testing/9base/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Joshua Haase +# Maintainer: Joshua Haase +pkgname="9base" +pkgver=6 +pkgrel=0 +pkgdesc="A port of various Plan 9 tools for Unix." +url="https://tools.suckless.org/9base/" +arch="all" +license="MIT" +makedepends="libucontext-dev linux-headers" +subpackages="$pkgname-doc $pkgname-troff" +source="https://dl.suckless.org/tools/9base-$pkgver.tar.gz config.mk.x86_64 config.mk.i686 config.mk.s390x config.mk.ppc64le dirread.patch s390x.patch" + +prepare() { + default_prepare + cp "$srcdir/config.mk.$(uname -m)" "$builddir/config.mk" +} + +build() { + make DESTDIR="$pkgdir" all +} + +package() { + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + make DESTDIR="$pkgdir" install +} + +doc() { + default_doc + mkdir -p "$subpkgdir/usr/lib/9base/share" + mv "$pkgdir/usr/lib/9base/share/man" "$subpkgdir/usr/lib/9base/share" +} + +troff() { + cd "$pkgdir" + mkdir -p "$subpkgdir/usr/lib/9base/bin" + mv "$pkgdir/usr/lib/9base/bin/troff" "$subpkgdir/usr/lib/9base/bin/troff" + mkdir -p "$subpkgdir/usr/lib/9base/lib/troff" + mv "$pkgdir/usr/lib/9base/lib/troff" "$subpkgdir/usr/lib/9base/lib/troff" +} + +sha512sums="38108a94118b56c6f3982e692beb1068c52f9aecd74447d6b552b77fae5e365eab72b4781bdf07d9696ac89d54371c1cae8cc0363de510b53988302acef50dba 9base-6.tar.gz +3a30955d59ad78c1bc4e2fbd0f511eb85624ed48b0aeceef436e3456f685690e064eb1f171a2080a34a0fcb40d874277a282864c720c9e612eca3ad848dec35e config.mk.x86_64 +7a58d4762c5ec9a0191f2cce15b23b2e60ec9445c357dc2e3925a5b4d5dec1c5eed6fb3565be07a25616c0c2b0768c21737b2d35082deb17bfc7a7f5f0c0d2a6 config.mk.i686 +61e67a22abf8f7d3dbfadda92cf0836e8726ae8225939318d0bf34dc05b47a12dd41de895f7b5df515ba5cd783dae368cce98706366cc28360a1987b4e7c652c config.mk.s390x +dd0f9ff55e103fd16f689f01e41769cf6bc6370201e790bf64236570cda2d0e6ef2954f1b5798feb4ebd65fc1a0563ce71c8a9b7fb05166a8ff28ac8be472dfe config.mk.ppc64le +5b47647245366e786059a28747fe9a36fd87d9df2e1a7f68e9a41f4adb7ec96f230a9abe94acbe5f82d62f4f85b061ff7ab7356d32072dd9ef7f677379f456f5 dirread.patch +f1f05e2a6081f2a451256de9af669e1ff1e82b6603b376677825421c11bd6ef22a8ab0eb89c15b0589252bada71b58214b6306127bdd379952203105f14e49e9 s390x.patch" diff --git a/testing/9base/config.mk.i686 b/testing/9base/config.mk.i686 new file mode 100644 index 0000000000..9279f21262 --- /dev/null +++ b/testing/9base/config.mk.i686 @@ -0,0 +1,24 @@ +# Customize to fit your system + +# paths +PREFIX = /usr/lib/9base +MANPREFIX = ${PREFIX}/share/man + +VERSION = 6 +OBJTYPE = 386 +#OBJTYPE = arm +#OBJTYPE = x86_64 + +# Linux/BSD +#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\"" +CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\"" +LDFLAGS += -static + +# Solaris +#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\"" +#LDFLAGS = -dn + +# compiler +AR = ar rc +CC = cc +YACC = ../yacc/9yacc diff --git a/testing/9base/config.mk.ppc64le b/testing/9base/config.mk.ppc64le new file mode 100644 index 0000000000..4b4a4d9629 --- /dev/null +++ b/testing/9base/config.mk.ppc64le @@ -0,0 +1,22 @@ +# Customize to fit your system + +# paths +PREFIX = /usr/lib/9base +MANPREFIX = ${PREFIX}/share/man + +VERSION = 6 +OBJTYPE = power + +# Linux/BSD +#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\"" +CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\"" +LDFLAGS += -static + +# Solaris +#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\"" +#LDFLAGS = -dn + +# compiler +AR = ar rc +CC = cc +YACC = ../yacc/9yacc diff --git a/testing/9base/config.mk.s390x b/testing/9base/config.mk.s390x new file mode 100644 index 0000000000..3efca66629 --- /dev/null +++ b/testing/9base/config.mk.s390x @@ -0,0 +1,22 @@ +# Customize to fit your system + +# paths +PREFIX = /usr/lib/9base +MANPREFIX = ${PREFIX}/share/man + +VERSION = 6 +OBJTYPE = s390x + +# Linux/BSD +#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\"" +CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\"" +LDFLAGS += -static + +# Solaris +#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\"" +#LDFLAGS = -dn + +# compiler +AR = ar rc +CC = cc +YACC = ../yacc/9yacc diff --git a/testing/9base/config.mk.x86_64 b/testing/9base/config.mk.x86_64 new file mode 100644 index 0000000000..51ce200eb0 --- /dev/null +++ b/testing/9base/config.mk.x86_64 @@ -0,0 +1,24 @@ +# Customize to fit your system + +# paths +PREFIX = /usr/lib/9base +MANPREFIX = ${PREFIX}/share/man + +VERSION = 6 +#OBJTYPE = 386 +#OBJTYPE = arm +OBJTYPE = x86_64 + +# Linux/BSD +#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\"" +CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\"" +LDFLAGS += -static + +# Solaris +#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\"" +#LDFLAGS = -dn + +# compiler +AR = ar rc +CC = cc +YACC = ../yacc/9yacc diff --git a/testing/9base/dirread.patch b/testing/9base/dirread.patch new file mode 100644 index 0000000000..daf60c6311 --- /dev/null +++ b/testing/9base/dirread.patch @@ -0,0 +1,17 @@ +--- 9base-6/lib9/dirread.c ++++ 9base-6/lib9/dirread.c +@@ -10,13 +10,7 @@ + static int + mygetdents(int fd, struct dirent *buf, int n) + { +- off_t off; +- int nn; +- +- /* This doesn't match the man page, but it works in Debian with a 2.2 kernel */ +- off = p9seek(fd, 0, 1); +- nn = getdirentries(fd, (void*)buf, n, &off); +- return nn; ++ return getdents(fd, buf, n); + } + #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) + static int diff --git a/testing/9base/s390x.patch b/testing/9base/s390x.patch new file mode 100644 index 0000000000..49a24eed7d --- /dev/null +++ b/testing/9base/s390x.patch @@ -0,0 +1,10 @@ +--- /dev/null ++++ 9base-6/lib9/getcallerpc-s390x.c +@@ -0,0 +1,7 @@ ++#include ++ ++ulong ++getcallerpc(void *x) ++{ ++ __builtin_return_address(0); ++} -- 2.17.1