From 759eb53f01cfa8f63af544e817272753f1bd2688 Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal Date: Thu, 28 Jul 2016 20:03:43 -0700 Subject: [PATCH 1/2] [freebsd] Partial fix for the release builds. The default gcc toolchain on freebsd has been bumped to 4.8 so the build scripts that hardcoded the gcc binary name are getting confused. The new version of SQLite seems to be getting confused between editline and readline. --- release/vagrant-static/build.sh | 4 ++-- release/vagrant-static/provision.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/vagrant-static/build.sh b/release/vagrant-static/build.sh index ad8c8b85..fe0cde3b 100755 --- a/release/vagrant-static/build.sh +++ b/release/vagrant-static/build.sh @@ -35,8 +35,8 @@ OS=$(uname -s) if test x"${OS}" != x"FreeBSD"; then ../lnav/configure \ LDFLAGS="-L${FAKE_ROOT}/lib" \ - CC="gcc44" \ - CXX="g++44" \ + CC="gcc48" \ + CXX="g++48" \ CPPFLAGS="-I${FAKE_ROOT}/include" \ PATH="${FAKE_ROOT}/bin:${PATH}" else diff --git a/release/vagrant-static/provision.sh b/release/vagrant-static/provision.sh index 3b826436..9faeb956 100755 --- a/release/vagrant-static/provision.sh +++ b/release/vagrant-static/provision.sh @@ -55,7 +55,7 @@ OS=$(uname -s) (cd bzip2-1.0.6 && make install PREFIX=${FAKE_ROOT}) (cd sqlite-* && - ./configure --prefix=${FAKE_ROOT} \ + ./configure --disable-editline --prefix=${FAKE_ROOT} \ CFLAGS="${SQLITE_CFLAGS}" \ && \ make && make install) From 438ab2c9d4089ca4923e924aa32dc0baf689ed3e Mon Sep 17 00:00:00 2001 From: Suresh Sundriyal Date: Thu, 28 Jul 2016 20:23:13 -0700 Subject: [PATCH 2/2] [freebsd] Some more build related fixes. --- release/vagrant-static/build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/vagrant-static/build.sh b/release/vagrant-static/build.sh index fe0cde3b..2a388893 100755 --- a/release/vagrant-static/build.sh +++ b/release/vagrant-static/build.sh @@ -48,6 +48,8 @@ fi make -j2 && strip -o /vagrant/lnav src/lnav -mkdir instdir -make install-strip DESTDIR=$PWD/instdir -(cd instdir/ && zip -r /vagrant/lnav-linux.zip .) +if test x"${OS}" != x"FreeBSD"; then + mkdir instdir + make install-strip DESTDIR=$PWD/instdir + (cd instdir/ && zip -r /vagrant/lnav-linux.zip .) +fi