]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Add sbin to the PATH in the bootstrap-depends.sh script
authorOndřej Surý <ondrej@sury.org>
Wed, 11 Jan 2017 16:21:25 +0000 (17:21 +0100)
committerOndřej Surý <ondrej@sury.org>
Wed, 11 Jan 2017 20:27:29 +0000 (21:27 +0100)
scripts/bootstrap-depends.sh

index b9cdf2881a64c1371ac4a2e1be6709f44d4d1926..67c3341618196b5a5cd2d0751672f82bd03cd2d9 100755 (executable)
@@ -17,7 +17,7 @@ NETTLE_TAG="3.3"
 NETTLE_URL="https://ftp.gnu.org/gnu/nettle/nettle-${NETTLE_TAG}.tar.gz"
 GNUTLS_TAG="3.5.8"
 GNUTLS_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${GNUTLS_TAG}.tar.xz"
-LUA_VER="2.0.4"
+LUA_VER="2.1.0-beta2"
 LUA_URL="https://github.com/LuaJIT/LuaJIT.git"
 HIREDIS_TAG="v0.13.3"
 HIREDIS_URL="https://github.com/redis/hiredis.git"
@@ -63,6 +63,7 @@ install -d ${PREFIX}/{lib,libexec,include,bin,sbin,man,share,etc,info,doc,var}
 
 # prepare build env
 export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+export PATH="${PREFIX}/bin:${PREFIX}/sbin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:${PATH}"
 export BUILD_DIR="$(pwd)/.build-depend"
 export LOG=$(pwd)/build.log
 [ ! -e ${BUILD_DIR} ] && mkdir ${BUILD_DIR}; cd ${BUILD_DIR}
@@ -150,7 +151,6 @@ pkg lua ${LUA_URL} v${LUA_VER} lib/pkgconfig/luajit.pc install BUILDMODE=dynamic
 
 # development releases of luajit do NOT install bin/luajit
 ln -sf "luajit-${LUA_VER}" "${PREFIX}/bin/luajit"
-ln -sf "libluajit-5.1.so.${LUA_VER}" "${PREFIX}/lib/libluajit-5.1.so"
 
 echo "Build success!"