From ae325613918c867cbaef798ae86448e78346a376 Mon Sep 17 00:00:00 2001
From: clamsawd <clamsawd@openmailbox.org>
Date: Thu, 18 Feb 2016 21:43:18 +0100
Subject: [PATCH] Fixed libssh2 build error

---
 .../aria2-i386-gnu-linux-cross-build-libs     | 29 ++-----------------
 .../aria2-x86_64-gnu-linux-build-libs         | 27 ++---------------
 .../aria2-i686-w64-mingw-build-libs           | 29 ++-----------------
 .../aria2-x86_64-w64-mingw-build-libs         | 27 ++---------------
 4 files changed, 10 insertions(+), 102 deletions(-)

diff --git a/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs b/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs
index c2d454b..1da6e96 100755
--- a/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs
+++ b/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs
@@ -63,7 +63,7 @@ export LDFLAGS="-m32"
   wget -c $OPENSSL
   tar zxvf openssl-1.0.2f.tar.gz
   cd openssl-1.0.2f/
-  CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./Configure --prefix=$PREFIX linux-elf
+  CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./Configure --prefix=$PREFIX linux-elf shared
   make
   make install
 #
@@ -72,7 +72,7 @@ export LDFLAGS="-m32"
   wget -c $SQLITE3
   tar zxvf sqlite-autoconf-3100200.tar.gz
   cd sqlite-autoconf-3100200/
-  CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./configure --prefix=$PREFIX --enable-static --disable-shared
+  CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./configure --prefix=$PREFIX --enable-static --enable-shared
   make
   make install
 #
@@ -84,30 +84,7 @@ export LDFLAGS="-m32"
   rm -rf $PREFIX/lib/pkgconfig/libssh2.pc
   CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./configure --without-libgcrypt --with-openssl --without-wincng --prefix=$PREFIX --enable-static --disable-shared
   make
-  make install
-  if [ -f $PREFIX/lib/pkgconfig/libssh2.pc ] ; then
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc"
-  else
-     echo "################################" > $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "# libssh2 installation details #" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "#################################" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "exec_prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "libdir=$PREFIX/lib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "includedir=$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Name: libssh2" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "URL: http://www.libssh2.org/" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Description: Library for SSH-based communication" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Version: 1.6.0" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Requires.private:" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs: -L$PREFIX/lib -lssh2 -m32 -lssl -lcrypto -lz" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs.private:  -m32 -lssl -lcrypto -lz" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Cflags: -I$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc created!"
-     cp -rf include/*.h $PREFIX/include
-  fi   
+  make install  
 #
  #cleaning
   cd ..
diff --git a/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs b/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs
index 08d319d..117fed6 100755
--- a/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs
+++ b/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs
@@ -59,7 +59,7 @@ cd $BUILD_DIRECTORY
   wget -c $OPENSSL
   tar zxvf openssl-1.0.2f.tar.gz
   cd openssl-1.0.2f/
-  PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./Configure --prefix=$PREFIX linux-x86_64
+  PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./Configure --prefix=$PREFIX linux-x86_64 shared
   make
   make install
 #
@@ -68,7 +68,7 @@ cd $BUILD_DIRECTORY
   wget -c $SQLITE3
   tar zxvf sqlite-autoconf-3100200.tar.gz
   cd sqlite-autoconf-3100200/
-  PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./configure --prefix=$PREFIX --enable-static --disable-shared
+  PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./configure --prefix=$PREFIX --enable-static --enable-shared
   make
   make install
 #
@@ -81,29 +81,6 @@ cd $BUILD_DIRECTORY
   PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./configure --without-libgcrypt --with-openssl --without-wincng --prefix=$PREFIX --enable-static --disable-shared
   make
   make install
-  if [ -f $PREFIX/lib/pkgconfig/libssh2.pc ] ; then
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc"
-  else
-     echo "################################" > $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "# libssh2 installation details #" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "#################################" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "exec_prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "libdir=$PREFIX/lib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "includedir=$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Name: libssh2" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "URL: http://www.libssh2.org/" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Description: Library for SSH-based communication" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Version: 1.6.0" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Requires.private: zlib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs: -L$PREFIX/lib -lssh2 -lssl -lcrypto -lz" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs.private:  -lssl -lcrypto -lz" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Cflags: -I$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc created!"
-     cp -rf include/*.h $PREFIX/include
-  fi  
 #
  #cleaning
   cd ..
diff --git a/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs b/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs
index 719d0fa..b280090 100755
--- a/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs
+++ b/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs
@@ -56,7 +56,7 @@ cd $BUILD_DIRECTORY
   wget -c $OPENSSL
   tar zxvf openssl-1.0.2f.tar.gz
   cd openssl-1.0.2f/
-  ./Configure mingw --cross-compile-prefix=$HOST- --prefix=$PREFIX
+  ./Configure mingw --cross-compile-prefix=$HOST- --prefix=$PREFIX shared
   make
   make install
 #
@@ -65,7 +65,7 @@ cd $BUILD_DIRECTORY
   wget -c $SQLITE3
   tar zxvf sqlite-autoconf-3100200.tar.gz
   cd sqlite-autoconf-3100200/
-  CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared
+  CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --enable-shared
   make
   make install
 #
@@ -77,30 +77,7 @@ cd $BUILD_DIRECTORY
   rm -rf $PREFIX/lib/pkgconfig/libssh2.pc
   CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --without-libgcrypt --with-openssl --without-wincng --prefix=$PREFIX --host=$HOST --enable-static --disable-shared
   make
-  make install
-  if [ -f $PREFIX/lib/pkgconfig/libssh2.pc ] ; then
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc"
-  else
-     echo "################################" > $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "# libssh2 installation details #" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "#################################" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "exec_prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "libdir=$PREFIX/lib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "includedir=$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Name: libssh2" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "URL: http://www.libssh2.org/" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Description: Library for SSH-based communication" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Version: 1.6.0" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Requires.private: zlib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs: -L$PREFIX/lib -lssh2 -lssl -lcrypto -lz -lws2_32" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs.private:  -lssl -lcrypto -lz -lws2_32" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Cflags: -I$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc created!"
-     cp -rf include/*.h $PREFIX/include
-  fi 
+  make install 
 #
  #cleaning
   cd ..
diff --git a/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs b/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs
index 02c1892..2f8b043 100755
--- a/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs
+++ b/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs
@@ -56,7 +56,7 @@ cd $BUILD_DIRECTORY
   wget -c $OPENSSL
   tar zxvf openssl-1.0.2f.tar.gz
   cd openssl-1.0.2f/
-  ./Configure mingw64 --cross-compile-prefix=$HOST- --prefix=$PREFIX
+  ./Configure mingw64 --cross-compile-prefix=$HOST- --prefix=$PREFIX shared
   make
   make install
 #
@@ -65,7 +65,7 @@ cd $BUILD_DIRECTORY
   wget -c $SQLITE3
   tar zxvf sqlite-autoconf-3100200.tar.gz
   cd sqlite-autoconf-3100200/
-  CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared
+  CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --enable-shared
   make
   make install
 #
@@ -78,29 +78,6 @@ cd $BUILD_DIRECTORY
   CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared
   make
   make install
-  if [ -f $PREFIX/lib/pkgconfig/libssh2.pc ] ; then
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc"
-  else
-     echo "################################" > $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "# libssh2 installation details #" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "#################################" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "exec_prefix=$PREFIX" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "libdir=$PREFIX/lib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "includedir=$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Name: libssh2" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "URL: http://www.libssh2.org/" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Description: Library for SSH-based communication" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Version: 1.6.0" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Requires.private: zlib" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs: -L$PREFIX/lib -lssh2 -lssl -lcrypto -lz -lws2_32" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Libs.private:  -lssl -lcrypto -lz -lws2_32" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "Cflags: -I$PREFIX/include" >> $PREFIX/lib/pkgconfig/libssh2.pc
-     echo "$PREFIX/lib/pkgconfig/libssh2.pc created!"
-     cp -rf include/*.h $PREFIX/include
-  fi
 #
  #cleaning
   cd ..