mirror of https://github.com/tstack/lnav.git
[release] some updates
This commit is contained in:
parent
b2e4e59a40
commit
5e6985d8a4
|
@ -10,17 +10,17 @@ clean-outbox: outbox
|
|||
rm -f outbox/*
|
||||
|
||||
PACKAGE_URLS = \
|
||||
https://www.libarchive.org/downloads/libarchive-3.5.1.tar.gz \
|
||||
https://www.libarchive.org/downloads/libarchive-3.6.1.tar.gz \
|
||||
https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz \
|
||||
ftp://ftp.gnu.org/gnu/ncurses/ncurses-5.9.tar.gz \
|
||||
https://ftp.pcre.org/pub/pcre/pcre-8.42.tar.gz \
|
||||
ftp://ftp.gnu.org/gnu/ncurses/ncurses-6.3.tar.gz \
|
||||
https://sourceforge.net/projects/pcre/files/pcre/8.42/pcre-8.42.tar.gz \
|
||||
https://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz \
|
||||
http://www.zlib.net/zlib-1.2.11.tar.gz \
|
||||
https://zlib.net/zlib-1.2.12.tar.gz \
|
||||
https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz \
|
||||
https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz \
|
||||
https://www.sqlite.org/2022/sqlite-autoconf-3380500.tar.gz \
|
||||
https://www.openssl.org/source/openssl-1.0.2n.tar.gz \
|
||||
https://www.libssh2.org/download/libssh2-1.9.0.tar.gz \
|
||||
https://curl.se/download/curl-7.77.0.tar.gz \
|
||||
https://curl.se/download/curl-7.83.0.tar.gz \
|
||||
https://tukaani.org/xz/xz-5.2.5.tar.gz
|
||||
|
||||
.PHONY: linux freebsd pkger download-pkgs musl
|
||||
|
|
|
@ -33,14 +33,14 @@ Vagrant.configure(2) do |config|
|
|||
config.vm.define :musl do |musl|
|
||||
musl.vbguest.auto_update = false
|
||||
musl.vm.synced_folder ".", "/vagrant", type: "virtualbox"
|
||||
musl.vm.network "private_network", ip: "10.11.12.16"
|
||||
musl.vm.network "private_network", ip: "192.168.56.16"
|
||||
musl.vm.provision "shell", path:"musl-pkg.sh"
|
||||
musl.vm.provision "shell", path:"provision.sh"
|
||||
musl.vm.box = "generic/alpine313"
|
||||
musl.vm.box = "generic/alpine315"
|
||||
end
|
||||
|
||||
config.vm.define :linux do |linux|
|
||||
linux.vm.network :private_network, ip: "10.11.12.14"
|
||||
linux.vm.network :private_network, ip: "192.168.56.14"
|
||||
linux.vm.provision "shell", path:"pkg.sh"
|
||||
linux.vm.provision "shell", path:"provision.sh"
|
||||
linux.vm.box = "centos/7"
|
||||
|
@ -48,7 +48,7 @@ Vagrant.configure(2) do |config|
|
|||
|
||||
config.vm.define :pkger do |pkger|
|
||||
# config.vm.synced_folder ".", "/vagrant", type: "nfs"
|
||||
pkger.vm.network :private_network, ip: "10.11.12.15"
|
||||
pkger.vm.network :private_network, ip: "192.168.56.15"
|
||||
pkger.vm.provision "shell", path:"provision-pkg.sh"
|
||||
pkger.vm.box = "ubuntu/xenial64"
|
||||
end
|
||||
|
|
|
@ -19,11 +19,11 @@ mkdir -p ~/github
|
|||
|
||||
cd ~/github
|
||||
if ! test -d lnav; then
|
||||
git clone git://github.com/tstack/lnav.git
|
||||
git clone https://github.com/tstack/lnav.git
|
||||
fi
|
||||
|
||||
cd ~/github/lnav
|
||||
git pull
|
||||
git pull --rebase
|
||||
|
||||
if test -n "$SRC_VERSION"; then
|
||||
git checkout "$SRC_VERSION"
|
||||
|
|
|
@ -73,12 +73,7 @@ OS=$(uname -s)
|
|||
make &&
|
||||
make install)
|
||||
|
||||
(cd ncurses-5.9 &&
|
||||
wget ftp://ftp.invisible-island.net/ncurses//5.9/ncurses-5.9-20141206-patch.sh.bz2 &&
|
||||
bunzip2 ncurses-5.9-20141206-patch.sh.bz2 &&
|
||||
bash ./ncurses-5.9-20141206-patch.sh)
|
||||
|
||||
(cd ncurses-5.9 && \
|
||||
(cd ncurses-6.3 && \
|
||||
./configure --prefix=${FAKE_ROOT} \
|
||||
--enable-ext-mouse \
|
||||
--enable-sigwinch \
|
||||
|
@ -98,7 +93,7 @@ OS=$(uname -s)
|
|||
make && make install)
|
||||
|
||||
if test x"${OS}" != x"FreeBSD"; then
|
||||
(cd zlib-1.2.11 && ./configure --prefix=${FAKE_ROOT} && make && make install)
|
||||
(cd zlib-1.2.12 && ./configure --prefix=${FAKE_ROOT} && make && make install)
|
||||
|
||||
(cd libssh2-* &&
|
||||
./configure --prefix=${FAKE_ROOT} \
|
||||
|
@ -118,7 +113,7 @@ if test x"${OS}" != x"FreeBSD"; then
|
|||
make &&
|
||||
make install)
|
||||
else
|
||||
(cd zlib-1.2.11 && ./configure --prefix=${FAKE_ROOT} "CFLAGS=-fPIC" \
|
||||
(cd zlib-1.2.12 && ./configure --prefix=${FAKE_ROOT} "CFLAGS=-fPIC" \
|
||||
&& make && make install)
|
||||
|
||||
(cd libssh2-* &&
|
||||
|
|
|
@ -1859,6 +1859,7 @@ main(int argc, char* argv[])
|
|||
}
|
||||
|
||||
(void) signal(SIGPIPE, SIG_IGN);
|
||||
setlocale(LC_ALL, "");
|
||||
try {
|
||||
std::locale::global(std::locale(""));
|
||||
} catch (const std::runtime_error& e) {
|
||||
|
|
Loading…
Reference in New Issue