mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
loksh: update to 6.7
This commit is contained in:
parent
f873a9b046
commit
2e33fb464d
3 changed files with 36 additions and 19 deletions
9
srcpkgs/loksh/files/cdefs.patch
Normal file
9
srcpkgs/loksh/files/cdefs.patch
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
--- include/sys/cdefs.h.orig 2020-05-22 21:05:19.805358049 -0700
|
||||||
|
+++ include/sys/cdefs.h 2020-05-22 21:05:49.069119627 -0700
|
||||||
|
@@ -53,4 +53,6 @@
|
||||||
|
|
||||||
|
#endif /* !_SYS_CDEFS_H_ */
|
||||||
|
|
||||||
|
+#ifdef __GLIBC__
|
||||||
|
#include_next <sys/cdefs.h>
|
||||||
|
+#endif
|
|
@ -1,13 +1,11 @@
|
||||||
--- Makefile.orig 2018-10-18 11:46:33.917801273 -0700
|
--- meson.build.orig 2020-05-22 20:21:50.457744069 -0700
|
||||||
+++ Makefile 2018-10-18 11:46:38.748833596 -0700
|
+++ meson.build 2020-05-22 20:46:43.193735356 -0700
|
||||||
@@ -9,8 +9,8 @@
|
@@ -5,7 +5,7 @@
|
||||||
MAN_DIR ?= $(PREFIX)/share/man
|
c_args = ['-D_GNU_SOURCE', '-DEMACS', '-DVI', '-Wno-format-security', '-Wno-pointer-sign']
|
||||||
DOC_DIR ?= $(PREFIX)/share/doc/loksh
|
deps = []
|
||||||
|
|
||||||
-NCURSES_CFLAGS = $(shell pkg-config --cflags ncurses)
|
-ncurses = dependency('ncurses', required: false)
|
||||||
-NCURSES_LDFLAGS = $(shell pkg-config --libs ncurses)
|
+ncurses = dependency('ncursesw', required: false)
|
||||||
+NCURSES_CFLAGS = $(shell pkg-config --cflags ncursesw)
|
if ncurses.found()
|
||||||
+NCURSES_LDFLAGS = $(shell pkg-config --libs ncursesw)
|
deps += [ncurses]
|
||||||
|
else
|
||||||
OBJECTS = alloc.o c_ksh.o c_sh.o c_test.o c_ulimit.o edit.o emacs.o eval.o \
|
|
||||||
exec.o expr.o history.o io.o jobs.o lex.o mail.o main.o misc.o \
|
|
||||||
|
|
|
@ -1,18 +1,19 @@
|
||||||
# Template file for 'loksh'
|
# Template file for 'loksh'
|
||||||
pkgname=loksh
|
pkgname=loksh
|
||||||
version=6.6
|
version=6.7
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-makefile
|
_lolibc_commit=f6bbd5bae97e58d0be6ea9fbbe5131853d5b0b70
|
||||||
make_build_args="HAVE_LIBBSD=1"
|
build_style=meson
|
||||||
make_install_args="BIN_NAME=loksh"
|
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="libbsd-devel ncurses-devel"
|
makedepends="ncurses-devel"
|
||||||
short_desc="Linux port of OpenBSD's ksh"
|
short_desc="Linux port of OpenBSD's ksh"
|
||||||
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
|
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
|
||||||
license="custom:Public Domain"
|
license="custom:Public Domain"
|
||||||
homepage="https://github.com/dimkr/loksh"
|
homepage="https://github.com/dimkr/loksh"
|
||||||
distfiles="https://github.com/dimkr/loksh/archive/${version}.tar.gz"
|
distfiles="https://github.com/dimkr/loksh/archive/${version}.tar.gz
|
||||||
checksum=97a020df82ceebe216c5a306e87360c5e3398d7403347aaff50978446ccb764d
|
https://github.com/dimkr/lolibc/archive/${_lolibc_commit}.tar.gz>lolibc.tar.gz"
|
||||||
|
checksum="5e921bb740348eab670160f92ec0e959ff35b5ae36db9e9ed3a1b6de3e1d7551
|
||||||
|
dec9c7d5759f3df1d4aeda419bd402a916b0c6681b114ea6899db78f20577cae"
|
||||||
register_shell="/bin/loksh"
|
register_shell="/bin/loksh"
|
||||||
|
|
||||||
alternatives="
|
alternatives="
|
||||||
|
@ -22,9 +23,18 @@ alternatives="
|
||||||
sh:sh.1:/usr/share/man/man1/loksh-sh.1
|
sh:sh.1:/usr/share/man/man1/loksh-sh.1
|
||||||
"
|
"
|
||||||
|
|
||||||
|
post_extract() {
|
||||||
|
patch -d "../lolibc-${_lolibc_commit}" -Np0 -i "${FILESDIR}/cdefs.patch"
|
||||||
|
rmdir subprojects/lolibc
|
||||||
|
ln -s "../../lolibc-${_lolibc_commit}" subprojects/lolibc
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LEGAL
|
vlicense LEGAL
|
||||||
|
|
||||||
|
mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/loksh
|
||||||
|
mv ${DESTDIR}/usr/share/man/man1/ksh.1 \
|
||||||
|
${DESTDIR}/usr/share/man/man1/loksh.1
|
||||||
mv ${DESTDIR}/usr/share/man/man1/sh.1 \
|
mv ${DESTDIR}/usr/share/man/man1/sh.1 \
|
||||||
${DESTDIR}/usr/share/man/man1/loksh-sh.1
|
${DESTDIR}/usr/share/man/man1/loksh-sh.1
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue