tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

bk: update to 7.3.3.

Browse Source
This commit is contained in:
maxice8 2019-02-18 03:30:19 -03:00 committed by Leah Neukirchen
parent 0f913f6c6b
commit ea684e98e1
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
srcpkgs/bk/patches/size_t.patch
View File

@ -1,22 +0,0 @@
--- src/slib.c.orig
+++ src/slib.c
@@ -14921,7 +14921,7 @@
* Makefile).
*/
extern struct kwval *kw2val_lookup(register const char *str,
- register unsigned int len);
+ register size_t len);
#include "kw2val_lookup.c"
#define notKeyword -1
--- src/cmd.pl.orig
+++ src/cmd.pl
@@ -63,7 +63,7 @@
u8 remote:1; /* always allowed as a remote command */
} CMD;
-CMD *cmd_lookup(const char *str, unsigned int len);
+CMD *cmd_lookup(const char *str, size_t len);
END

14
srcpkgs/bk/template
View File

@ -1,8 +1,8 @@
# Template file for 'bk' # Template file for 'bk'
pkgname=bk pkgname=bk
reverts="7.3ce.1_1 7.3ce.1_2 7.3ce_1 7.3ce_2" reverts="7.3ce.1_1 7.3ce.1_2 7.3ce_1 7.3ce_2"
version=7.3.2 version=7.3.3
revision=4 revision=1
hostmakedepends="gperf groff perl bison pkg-config" hostmakedepends="gperf groff perl bison pkg-config"
makedepends="libXft-devel libtomcrypt-devel libtommath-devel pcre-devel liblz4-devel" makedepends="libXft-devel libtomcrypt-devel libtommath-devel pcre-devel liblz4-devel"
# bundles: tcl tk # bundles: tcl tk
@ -11,24 +11,26 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0" license="Apache-2.0"
homepage="http://www.bitkeeper.org/" homepage="http://www.bitkeeper.org/"
distfiles="http://www.bitkeeper.org/downloads/${version}/${pkgname}-${version}.src.tar.gz" distfiles="http://www.bitkeeper.org/downloads/${version}/${pkgname}-${version}.src.tar.gz"
checksum=833bf095a1f9c2be435fddbb3ffe10dadfad1853127b97892f1a81c884d4fe1d checksum=da2b8ef3044b9fc9d96cbd5990e5a9e989f5856f9b394013affc1e25014a2928
# Needs reworking of the build system. # Needs reworking of the build system.
nocross=yes nocross=yes
post_extract() { post_extract() {
# For musl: # For musl:
sed -i '1i#define __DEFINED_FILE' src/libc/stdio_remap.h vsed -e '1i#define __DEFINED_FILE' -i src/libc/stdio_remap.h
# For glibc: # For glibc:
sed -i '1i#define __FILE_defined' src/libc/stdio_remap.h vsed -e '1i#define __FILE_defined' -i src/libc/stdio_remap.h
sed -i 's/__linux__/__GLIBC__/' src/libc/utils/stackdump.c vsed -e 's/__linux__/__GLIBC__/' -i src/libc/utils/stackdump.c
} }
do_build() { do_build() {
make ${makejobs} \ make ${makejobs} \
CC="$CC" CXX="$CXX" LD="$CC" RANLIB="$RANLIB" \ CC="$CC" CXX="$CXX" LD="$CC" RANLIB="$RANLIB" \
CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \ CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \
LDFLAGS="$CFLAGS $LDFLAGS" Q= LDFLAGS="$CFLAGS $LDFLAGS" Q=
} }
do_install() { do_install() {
# Upstream recommended site-wide location. # Upstream recommended site-wide location.
make install DESTDIR=${DESTDIR} BINDIR=/usr/libexec/bitkeeper make install DESTDIR=${DESTDIR} BINDIR=/usr/libexec/bitkeeper