reposurgeon: respect MAKE_JOBS, pass in -v to "go build", hack away at

some parts of github.com/pkg/term/termios unused by reposurgeon which fail
to build on i386
This commit is contained in:
sthen 2022-08-28 10:26:39 +00:00
parent ea87766540
commit 7adf43f353
3 changed files with 49 additions and 2 deletions

View File

@ -1,7 +1,7 @@
COMMENT= tool for editing version-control repository history
DISTNAME= reposurgeon-4.32
#EXTRACT_SUFX= .tar.xz
REVISION= 0
CATEGORIES= devel
@ -13,7 +13,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c pthread
#MASTER_SITES= http://www.catb.org/esr/reposurgeon/
# generated from upstream distfile with "go mod vendor"
# generated from upstream distfile (.tar.xz) with "go mod vendor"
MASTER_SITES= https://spacehopper.org/mirrors/
USE_GMAKE= Yes
@ -26,6 +26,7 @@ MODRUBY_RUNDEP= No
WRKSRC= ${WRKDIST}
WRKBUILD= ${WRKDIST}
MODGO_GOPATH= ${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}:${WRKSRC}/vendor
MAKE_ENV= GOFLAGS=-v GOMAXPROCS=${MAKE_JOBS}
FAKE_FLAGS= mandir=man

View File

@ -0,0 +1,26 @@
Index: vendor/github.com/pkg/term/termios/termios_bsd.go
--- vendor/github.com/pkg/term/termios/termios_bsd.go.orig
+++ vendor/github.com/pkg/term/termios/termios_bsd.go
@@ -56,22 +56,6 @@ func Tcdrain(fd uintptr) error {
return unix.IoctlSetInt(int(fd), unix.TIOCDRAIN, 0)
}
-// Tcflush discards data written to the object referred to by fd but not transmitted, or data received but not read, depending on the value of which.
-func Tcflush(fd, which uintptr) error {
- var com int
- switch which {
- case unix.TCIFLUSH:
- com = FREAD
- case unix.TCOFLUSH:
- com = FWRITE
- case unix.TCIOFLUSH:
- com = FREAD | FWRITE
- default:
- return unix.EINVAL
- }
- return unix.IoctlSetPointerInt(int(fd), unix.TIOCFLUSH, com)
-}
-
// Cfgetispeed returns the input baud rate stored in the termios structure.
func Cfgetispeed(attr *unix.Termios) uint32 { return uint32(attr.Ispeed) }

View File

@ -0,0 +1,20 @@
Index: vendor/github.com/pkg/term/termios/termios.go
--- vendor/github.com/pkg/term/termios/termios.go.orig
+++ vendor/github.com/pkg/term/termios/termios.go
@@ -16,16 +16,6 @@ func Tiocmset(fd uintptr, status int) error {
return unix.IoctlSetInt(int(fd), unix.TIOCMSET, status)
}
-// Tiocmbis sets the indicated modem bits.
-func Tiocmbis(fd uintptr, status int) error {
- return unix.IoctlSetPointerInt(int(fd), unix.TIOCMBIS, status)
-}
-
-// Tiocmbic clears the indicated modem bits.
-func Tiocmbic(fd uintptr, status int) error {
- return unix.IoctlSetPointerInt(int(fd), unix.TIOCMBIC, status)
-}
-
// Cfmakecbreak modifies attr for cbreak mode.
func Cfmakecbreak(attr *unix.Termios) {
attr.Lflag &^= unix.ECHO | unix.ICANON