From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- .../lftp/files/lftp-4.7.5-libdir-additional.patch | 12 ++++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch | 10 ++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch | 11 +++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch | 10 ++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch | 18 ++++++++++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch | 11 +++++++++++ net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch | 18 ++++++++++++++++++ net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch | 18 ++++++++++++++++++ net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch | 10 ++++++++++ net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch | 18 ++++++++++++++++++ net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch | 20 ++++++++++++++++++++ 11 files changed, 156 insertions(+) create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch create mode 100644 net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch create mode 100644 net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch create mode 100644 net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch create mode 100644 net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch create mode 100644 net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch (limited to 'net-ftp/lftp/files') diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch new file mode 100644 index 000000000000..bf7f0a96d9f5 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-additional.patch @@ -0,0 +1,12 @@ +--- a/m4/lib-prefix.m4 ++++ b/m4/lib-prefix.m4 +@@ -108,7 +108,8 @@ + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. +- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" ++ dnl No, let's not do that. ++ : + fi + fi + fi diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch new file mode 100644 index 000000000000..e855ac194325 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-configure.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,6 @@ + esac + + if test x$socks_loc != x; then +- LDFLAGS="$LDFLAGS -L$socks_loc/lib" + CPPFLAGS="$CPPFLAGS -I$socks_loc/include" + fi + diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch new file mode 100644 index 000000000000..f82afc782565 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-expat.patch @@ -0,0 +1,11 @@ +--- a/m4/ax_lib_expat.m4 ++++ b/m4/ax_lib_expat.m4 +@@ -109,7 +109,7 @@ + + if test -n "$expat_prefix"; then + expat_include_dir="$expat_prefix/include" +- expat_ld_flags="-L$expat_prefix/lib" ++ expat_ld_flags="-L$libdir" + expat_lib_flags="-lexpat" + run_expat_test="yes" + elif test "$expat_requested" = "yes"; then diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch new file mode 100644 index 000000000000..890138013dad --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-libidn.patch @@ -0,0 +1,10 @@ +--- a/m4/lftp.m4 ++++ b/m4/lftp.m4 +@@ -319,7 +319,6 @@ + libidn=$withval, libidn=yes) + if test "$libidn" != "no"; then + if test "$libidn" != "yes"; then +- LDFLAGS="${LDFLAGS} -L$libidn/lib" + CPPFLAGS="${CPPFLAGS} -I$libidn/include" + fi + AC_CHECK_HEADER(idna.h, diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch new file mode 100644 index 000000000000..44c5239ae03f --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-openssl.patch @@ -0,0 +1,18 @@ +--- a/m4/ssl.m4 ++++ b/m4/ssl.m4 +@@ -10,7 +10,6 @@ + old_CPPFLAGS="$CPPFLAGS" + LIBS="$LIBS -lssl -lcrypto" + if test $loc != default; then +- LDFLAGS="$LDFLAGS -L$loc/lib" + CPPFLAGS="$CPPFLAGS -I$loc/include" + fi + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +@@ -21,7 +20,6 @@ + if test $found_loc != "none"; then + lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\"" + if test $found_loc != default; then +- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib -R$found_loc/lib\"" + lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include" + fi + break; diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch new file mode 100644 index 000000000000..01c9371870c0 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch @@ -0,0 +1,11 @@ +--- a/m4/lftp_lib_readline.m4 ++++ b/m4/lftp_lib_readline.m4 +@@ -107,7 +107,7 @@ + if test -f "$readline_include_dir/readline/readline.h"; then + readline_include_dir="$readline_include_dir/readline" + fi +- readline_ld_flags="-L$readline_prefix/lib" ++ readline_ld_flags="-L$libdir" + readline_lib_flags="-lreadline" + run_readline_test="yes" + elif test "$readline_requested" = "yes"; then diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch new file mode 100644 index 000000000000..9ec7c1b0dd17 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.7.5-libdir-zlib.patch @@ -0,0 +1,18 @@ +--- a/m4/ax_check_zlib.m4 ++++ b/m4/ax_check_zlib.m4 +@@ -105,7 +105,6 @@ + ZLIB_OLD_LDFLAGS=$LDFLAGS + ZLIB_OLD_CPPFLAGS=$CPPFLAGS + if test -n "${ZLIB_HOME}"; then +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + fi + AC_LANG_SAVE +@@ -120,7 +119,6 @@ + # + m4_ifblank([$1],[ + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + LIBS="-lz $LIBS" + AC_DEFINE([HAVE_LIBZ], [1], + [Define to 1 if you have `z' library (-lz)]) diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch new file mode 100644 index 000000000000..d8d620b8ee5f --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-configure.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,6 @@ + esac + + if test x$socks_loc != x; then +- LDFLAGS="$LDFLAGS -L$socks_loc/lib" + CPPFLAGS="$CPPFLAGS -I$socks_loc/include" + fi + +@@ -307,7 +306,6 @@ + AX_CHECK_ZLIB([ + AC_SUBST([ZLIB],[-lz]) + r=""; test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && r=" -R${ZLIB_HOME}/lib" +- AC_SUBST([ZLIB_LDFLAGS],["-L${ZLIB_HOME}/lib$r"]) + AC_SUBST([ZLIB_CPPFLAGS],["-I${ZLIB_HOME}/include"]) + ],[ + AC_MSG_ERROR([cannot find -lz library, install zlib-devel package]) diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch new file mode 100644 index 000000000000..cae07b9bafed --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-libidn2.patch @@ -0,0 +1,10 @@ +--- a/m4/lftp.m4 ++++ b/m4/lftp.m4 +@@ -319,7 +319,6 @@ + libidn2=$withval, libidn2=yes) + if test "$libidn2" != "no"; then + if test "$libidn2" != "yes"; then +- LDFLAGS="${LDFLAGS} -L$libidn2/lib" + CPPFLAGS="${CPPFLAGS} -I$libidn2/include" + fi + AC_CHECK_HEADER(idn2.h, diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch new file mode 100644 index 000000000000..f8bf45b1d590 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-openssl.patch @@ -0,0 +1,18 @@ +--- a/m4/ssl.m4 ++++ b/m4/ssl.m4 +@@ -10,7 +10,6 @@ + old_CPPFLAGS="$CPPFLAGS" + LIBS="$LIBS -lssl -lcrypto" + if test $loc != default; then +- LDFLAGS="$LDFLAGS -L$loc/lib" + CPPFLAGS="$CPPFLAGS -I$loc/include" + fi + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +@@ -22,7 +21,6 @@ + lftp_cv_openssl="OPENSSL_LIBS=\"-lssl -lcrypto\"" + if test $found_loc != default; then + r=""; test "$enable_rpath" = yes -a "$found_loc" != /usr && r=" -R$found_loc/lib" +- lftp_cv_openssl="$lftp_cv_openssl OPENSSL_LDFLAGS=\"-L$found_loc/lib$r\"" + lftp_cv_openssl="$lftp_cv_openssl OPENSSL_CPPFLAGS=-I$found_loc/include" + fi + break; diff --git a/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch new file mode 100644 index 000000000000..7ff003fe6eb3 --- /dev/null +++ b/net-ftp/lftp/files/lftp-4.8.2-libdir-zlib.patch @@ -0,0 +1,20 @@ +--- a/m4/ax_check_zlib.m4 ++++ b/m4/ax_check_zlib.m4 +@@ -105,7 +105,6 @@ + ZLIB_OLD_LDFLAGS="$LDFLAGS" + ZLIB_OLD_CPPFLAGS="$CPPFLAGS" + if test -n "${ZLIB_HOME}"; then +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + fi + AC_LANG_SAVE +@@ -118,8 +118,7 @@ + # If both library and header were found, action-if-found + # + m4_ifblank([$1],[ +- test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr && \ +- LDFLAGS="$LDFLAGS -R${ZLIB_HOME}/lib" ++ test "$enable_rpath" = yes -a "$ZLIB_HOME" != /usr + LIBS="-lz $LIBS" + AC_DEFINE([HAVE_LIBZ], [1], + [Define to 1 if you have `z' library (-lz)]) -- cgit v1.2.3