Merge pull request #334 from sureshsundriyal/freebsd

[freebsd] Partial fix for the release builds.
pull/335/head
Tim Stack 8 years ago committed by GitHub
commit 25593204e2

@ -35,8 +35,8 @@ OS=$(uname -s)
if test x"${OS}" != x"FreeBSD"; then if test x"${OS}" != x"FreeBSD"; then
../lnav/configure \ ../lnav/configure \
LDFLAGS="-L${FAKE_ROOT}/lib" \ LDFLAGS="-L${FAKE_ROOT}/lib" \
CC="gcc44" \ CC="gcc48" \
CXX="g++44" \ CXX="g++48" \
CPPFLAGS="-I${FAKE_ROOT}/include" \ CPPFLAGS="-I${FAKE_ROOT}/include" \
PATH="${FAKE_ROOT}/bin:${PATH}" PATH="${FAKE_ROOT}/bin:${PATH}"
else else
@ -48,6 +48,8 @@ fi
make -j2 && strip -o /vagrant/lnav src/lnav make -j2 && strip -o /vagrant/lnav src/lnav
mkdir instdir if test x"${OS}" != x"FreeBSD"; then
make install-strip DESTDIR=$PWD/instdir mkdir instdir
(cd instdir/ && zip -r /vagrant/lnav-linux.zip .) make install-strip DESTDIR=$PWD/instdir
(cd instdir/ && zip -r /vagrant/lnav-linux.zip .)
fi

@ -55,7 +55,7 @@ OS=$(uname -s)
(cd bzip2-1.0.6 && make install PREFIX=${FAKE_ROOT}) (cd bzip2-1.0.6 && make install PREFIX=${FAKE_ROOT})
(cd sqlite-* && (cd sqlite-* &&
./configure --prefix=${FAKE_ROOT} \ ./configure --disable-editline --prefix=${FAKE_ROOT} \
CFLAGS="${SQLITE_CFLAGS}" \ CFLAGS="${SQLITE_CFLAGS}" \
&& \ && \
make && make install) make && make install)

Loading…
Cancel
Save