Merge 798af3e into 72506af

zecke · web-flow · commit 4ea002569801 · 2019-03-28T15:49:32.000Z
diff --git a/build.linux32ARMv6/third-party/Makefile.libgit2 b/build.linux32ARMv6/third-party/Makefile.libgit2
@@ -22,16 +22,12 @@ $(LIBGIT2ARCHIVE):
 $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cd $(LIBGIT2DIR) \
-		&& cmake \
+		&& PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
 			-DBUILD_CLAR=OFF \
-			-DOPENSSL_FOUND=ON \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.so.1.0.1 \
 			-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=$(THIRDPARTYLIBDIR) \
+			-DOPENSSL_ROOT_DIR=$(THIRDPARTYOUTDIR) \
 		&& make \
 		&& make install
 
diff --git a/build.linux32x86/third-party/Makefile.libgit2 b/build.linux32x86/third-party/Makefile.libgit2
@@ -27,7 +27,7 @@ $(LIBGIT2ARCHIVE):
 $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cd $(LIBGIT2DIR) \
-		&& LD_FLAGS="-L$(THIRDPARTYLIBDIR)" cmake \
+		&& LD_FLAGS="-L$(THIRDPARTYLIBDIR)" PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DBUILD_CLAR=OFF \
 			-DCMAKE_C_FLAGS="-m32 -L$(THIRDPARTYLIBDIR)" \
@@ -36,10 +36,6 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 			-DOPENSSL_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
 			-DOPENSSL_LIBRARIES=libssl.so \
 			-DUSE_SSH=OFF \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
-			-DLIBSSH2_LIBRARIES=libssh2.so \
 		&& sed -i.bak 's/x86_64-linux-gnu/i386-linux-gnu/g' CMakeCache.txt \
 		&& LD_FLAGS="-L$(THIRDPARTYLIBDIR)" make \
 		&& make install
diff --git a/build.linux64ARMv8/third-party/Makefile.libgit2 b/build.linux64ARMv8/third-party/Makefile.libgit2
@@ -22,16 +22,12 @@ $(LIBGIT2ARCHIVE):
 $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cd $(LIBGIT2DIR) \
-		&& cmake \
+		&& PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
 			-DBUILD_CLAR=OFF \
-			-DOPENSSL_FOUND=ON \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.so.1.0.1 \
 			-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=$(THIRDPARTYLIBDIR) \
+			-DOPENSSL_ROOT_DIR=$(THIRDPARTYOUTDIR) \
 		&& make \
 		&& make install
 
diff --git a/build.linux64x64/third-party/Makefile.libgit2 b/build.linux64x64/third-party/Makefile.libgit2
@@ -22,15 +22,12 @@ $(LIBGIT2ARCHIVE):
 $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cd $(LIBGIT2DIR) \
-		&& cmake \
+		&& PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
 			-DBUILD_CLAR=OFF \
 			-DCMAKE_C_FLAGS="-m64" \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARY_DIRS=$(THIRDPARTYLIBDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.so \
+			-DOPENSSL_ROOT_DIR=$(THIRDPARTYOUTDIR) \
 		&& make \
 		&& make install
 
diff --git a/build.linux64x64/third-party/Makefile.libssh2 b/build.linux64x64/third-party/Makefile.libssh2
@@ -26,6 +26,7 @@ $(THIRDPARTYLIBDIR)/$(LIBSSH2LIBNAME): $(LIBSSH2ARCHIVE)
 			--prefix='$(THIRDPARTYOUTDIR)' \
 			CFLAGS='-m64' \
 			LDFLAGS='-m64' \
+			CPPFLAGS='-I$(THIRDPARTYINCLUDEDIR)' \
 		&& make \
 		&& make install
 
diff --git a/build.macos32x86/third-party/Makefile.libgit2 b/build.macos32x86/third-party/Makefile.libgit2
@@ -30,7 +30,7 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 			-DOPENSSL_FOUND=ON \
 			-DLIBSSH2_FOUND=ON \
 			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.1.dylib \
+			-DLIBSSH2_LIBRARIES=libssh2.1.dylib \
 			-DCMAKE_C_FLAGS="-m32 -L$(THIRDPARTYLIBDIR) -lssl -lcrypto" \
 			-DCMAKE_OSX_ARCHITECTURES=i386 \
 			-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,@executable_path:@executable_path/Plugins \
diff --git a/build.macos64x64/third-party/Makefile.libgit2 b/build.macos64x64/third-party/Makefile.libgit2
@@ -30,7 +30,7 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 			-DOPENSSL_FOUND=ON \
 			-DLIBSSH2_FOUND=ON \
 			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2.1.dylib \
+			-DLIBSSH2_LIBRARIES=libssh2.1.dylib \
 			-DCMAKE_C_FLAGS="-m64 -L$(THIRDPARTYLIBDIR) -lssl -lcrypto -liconv" \
 			-DCMAKE_OSX_ARCHITECTURES=x86_64 \
 			-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,@executable_path:@executable_path/Plugins \
diff --git a/build.win32x86/third-party/Makefile.libgit2 b/build.win32x86/third-party/Makefile.libgit2
@@ -29,7 +29,7 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 			-DBUILD_CLAR=OFF \
 			-DLIBSSH2_FOUND=ON \
 			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2-1.dll \
+			-DLIBSSH2_LIBRARIES=libssh2-1.dll \
 			-DCMAKE_C_FLAGS="$(THIRDPARTY_CFLAGS)" \
 		&& make \
 		&& make install
diff --git a/third-party/libgit2.spec b/third-party/libgit2.spec
@@ -1,8 +1,8 @@
-libgit2_spec_download_url:=https://github.com/libgit2/libgit2/archive/v0.25.1.tar.gz
-libgit2_spec_archive_name:=libgit2-v0.25.1.tar.gz
-libgit2_spec_unpack_dir_name:=libgit2-0.25.1
-libgit2_spec_product_name_macOS:=libgit2.0.25.1.dylib
-libgit2_spec_product_name_linux:=libgit2.so.0.25.1
+libgit2_spec_download_url:=https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz
+libgit2_spec_archive_name:=libgit2-v0.28.1.tar.gz
+libgit2_spec_unpack_dir_name:=libgit2-0.28.1
+libgit2_spec_product_name_macOS:=libgit2.0.28.1.dylib
+libgit2_spec_product_name_linux:=libgit2.so.0.28.1
 libgit2_spec_product_name_windows:=libgit2.dll
 libgit2_spec_symlinks_macOS:=libgit2*.dylib
 libgit2_spec_symlinks_linux:=libgit2.so*
diff --git a/third-party/libpng.spec b/third-party/libpng.spec
@@ -1,6 +1,6 @@
-libpng_spec_download_url:=ftp://ftp-osl.osuosl.org/pub/libpng/src/archive/gz/libpng12/libpng-1.2.49.tar.gz
-libpng_spec_archive_name:=libpng-1.2.49.tar.gz
-libpng_spec_unpack_dir_name:=libpng-1.2.49
+libpng_spec_download_url:=ftp://ftp-osl.osuosl.org/pub/libpng/src/archive/gz/libpng12/libpng-1.6.36.tar.gz
+libpng_spec_archive_name:=libpng-1.6.36.tar.gz
+libpng_spec_unpack_dir_name:=libpng-1.6.36
 libpng_spec_product_name_macOS:=libpng12.0.dylib
 libpng_spec_product_name_linux:=
 libpng_spec_product_name_windows:=libpng12-0.dll
diff --git a/third-party/libssh2.spec b/third-party/libssh2.spec
@@ -1,6 +1,6 @@
-libssh2_spec_download_url:=https://www.libssh2.org/download/libssh2-1.7.0.tar.gz		 
-libssh2_spec_archive_name:=libssh2-1.7.0.tar.gz
-libssh2_spec_unpack_dir_name:=libssh2-1.7.0
+libssh2_spec_download_url:=https://www.libssh2.org/download/libssh2-1.8.2.tar.gz
+libssh2_spec_archive_name:=libssh2-1.8.2.tar.gz
+libssh2_spec_unpack_dir_name:=libssh2-1.8.2
 libssh2_spec_product_name_macOS:=libssh2.1.dylib
 libssh2_spec_product_name_linux:=libssh2.so.1.0.1
 libssh2_spec_product_name_windows:=libssh2-1.dll
diff --git a/third-party/openssl.spec b/third-party/openssl.spec
@@ -1,6 +1,6 @@
-openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.0.2q.tar.gz
-openssl_spec_archive_name:=openssl-1.0.2q.tar.gz
-openssl_spec_unpack_dir_name:=openssl-1.0.2q
+openssl_spec_download_url:=https://www.openssl.org/source/openssl-1.0.2r.tar.gz
+openssl_spec_archive_name:=openssl-1.0.2r.tar.gz
+openssl_spec_unpack_dir_name:=openssl-1.0.2r
 openssl_spec_product1_name_macOS:=libssl.1.0.0.dylib
 openssl_spec_product2_name_macOS:=libcrypto.1.0.0.dylib
 openssl_spec_product1_name_linux:=libssl.so.1.0.0
