[release] some updates to the release makefile

pull/254/head
Timothy Stack 9 years ago
parent b7d7fe70c7
commit 06c74c450f

@ -74,6 +74,10 @@ AC_CHECK_SIZEOF(size_t)
AC_STRUCT_TIMEZONE
AC_ARG_ENABLE([static],
AS_HELP_STRING([--disable-static],
[Disable static linking]))
AC_SEARCH_LIBS(openpty, util)
AC_SEARCH_LIBS(gzseek, z, [], [AC_MSG_ERROR([libz required to build])])
AC_SEARCH_LIBS(BZ2_bzopen, bz2,
@ -144,11 +148,8 @@ AS_VAR_SET(ALL_LDFLAGS, "$SQLITE3_LDFLAGS $READLINE_LDFLAGS $LDFLAGS")
static_lib_list="libncurses.a libreadline.a libsqlite3.a libz.a libtinfo.a"
static_lib_list="$static_lib_list libpcre.a libpcrecpp.a libncursesw.a libbz2.a"
static_lib_list="$static_lib_list libgpm.a"
static_lib_list="$static_lib_list libgpm.a libcurl.a libcrypto.a libssl.a libssh2.a"
AC_ARG_ENABLE([static],
AS_HELP_STRING([--disable-static],
[Disable static linking]))
if test x"${enable_static}" != x"no"; then
case "$host_os" in
darwin*)

@ -3,7 +3,7 @@
FAKE_ROOT=/home/vagrant/fake.root
rm -rf ~/extract
mkdir -p ~/fake.root ~/packages ~/extract ~/github
mkdir -p ${FAKE_ROOT} ~/packages ~/extract ~/github
export PATH=${FAKE_ROOT}/bin:${PATH}
@ -17,12 +17,16 @@ PACKAGE_URLS="\
ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz \
http://zlib.net/zlib-1.2.8.tar.gz \
http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz \
http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz"
http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz \
https://www.openssl.org/source/openssl-1.0.1p.tar.gz \
http://www.libssh2.org/download/libssh2-1.6.0.tar.gz \
http://curl.haxx.se/download/curl-7.43.0.tar.gz \
"
cd ~/packages
for url in $PACKAGE_URLS; do
wget -N $url
wget --no-check-certificate -N $url
done
cd ~/extract
@ -88,3 +92,25 @@ fi
CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_SOUNDEX" \
&& \
make && make install)
(cd openssl-* &&
./config --prefix=${FAKE_ROOT} -fPIC &&
make &&
make install)
(cd libssh2-* &&
./configure --PREFIX=${FAKE_ROOT} \
--with-libssl-prefix=/home/vagrant/fake.root \
--with-libz-prefix=/home/vagrant/fake.root \
"LDFLAGS=-ldl" &&
make &&
make install)
(cd curl-* &&
./configure --prefix=${FAKE_ROOT} \
--with-libssh2=${FAKE_ROOT} \
--with-ssl=${FAKE_ROOT} \
--with-zlib=${FAKE_ROOT} \
"LDFLAGS=-ldl" &&
make &&
make install)

Loading…
Cancel
Save