diff --git a/build.sh b/build.sh index 26e673a7..e18c2227 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ # Set CH version RT_CH_MAJOR_VERSION=1.6 RT_CH_MINOR_RELEASE=0 -RT_CH_MINOR_GIT=1 +RT_CH_MINOR_GIT=11 # Set latest major lT/rT release versions LT_MAJOR=0.13 @@ -152,6 +152,7 @@ esac set_compiler_flags() { # Set final compiler flags + export CPPFLAGS="-I $INST_DIR/include${CPPFLAGS:+ }${CPPFLAGS}" # required by libtorrent with libcurl export PKG_CONFIG_PATH="$INST_DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}" export LDFLAGS="-Wl,-rpath,'\$\$ORIGIN/../lib' -Wl,-rpath,'\$\$ORIGIN/../lib/$RT_CH_DIRNAME/lib'${LDFLAGS:+ }${LDFLAGS}" [[ -z "${CXXFLAGS+x}" ]] && [[ -z "${CFLAGS+x}" ]] || \ @@ -164,6 +165,7 @@ display_env_vars() { # Display env vars echo "${BOLD}Env for building $RT_CH_TITLE${VANILLA_POSTFIX} $RT_CH_VERSION $RT_VERSION/$LT_VERSION into $INST_DIR$OFF" echo printf "export OPTIMIZE_BUILD=%q\n" "${OPTIMIZE_BUILD}" + printf "export CPPFLAGS=%q\n" "${CPPFLAGS}" printf "export PKG_CONFIG_PATH=%q\n" "${PKG_CONFIG_PATH}" printf "export LDFLAGS=%q\n" "${LDFLAGS}" [[ -z "${CFLAGS+x}" ]] || \ @@ -388,15 +390,16 @@ build_curl() { # Build direct dependency: curl bold "~~~~~~~~~~~~~~~~~~~~~~~~ Building curl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~" ( set +x ; cd curl-$CURL_VERSION \ - && ./configure --prefix=$INST_DIR --enable-ares=$INST_DIR --with-ssl --without-nss --without-libssh2 --without-librtmp --without-libidn2 \ - --disable-ntlm-wb --disable-sspi --disable-threaded-resolver --disable-libcurl-option --disable-manual --disable-gopher --disable-smtp --disable-file \ - --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict --disable-rtsp --disable-ldap --disable-ftp \ + && ./configure --prefix=$INST_DIR --enable-ares=$INST_DIR --with-ssl \ && $MAKE $MAKE_OPTS \ && $MAKE install \ && chrpath -r "\$ORIGIN/../lib:\$ORIGIN/../lib/$RT_CH_DIRNAME/lib" "$INST_DIR/lib/libcurl.so" \ || fail "during building 'curl'!" ) touch $TARBALLS_DIR/DONE-curl +# && ./configure --prefix=$INST_DIR --enable-ares=$INST_DIR --with-ssl --without-nss --without-libssh2 --without-librtmp --without-libidn2 \ +# --disable-ntlm-wb --disable-sspi --disable-threaded-resolver --disable-libcurl-option --disable-manual --disable-gopher --disable-smtp --disable-file \ +# --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict --disable-rtsp --disable-ldap --disable-ftp \ } build_xmlrpc() { # Build direct dependency: xmlrpc-c @@ -430,6 +433,7 @@ build_lt() { # Build libTorrent && ./configure --prefix=$INST_DIR $CFG_OPTS $CFG_OPTS_LT \ && $MAKE $MAKE_OPTS \ && $MAKE install \ + && chrpath -r "\$ORIGIN/../lib:\$ORIGIN/../lib/$RT_CH_DIRNAME/lib" "$INST_DIR/lib/libtorrent.so" \ || fail "during building 'libtorrent'!" ) touch $TARBALLS_DIR/DONE-libtorrent