update n code clones and deal with their speciality

Note: In general there is little reason for treating these build configs differently. Thanks to the GNU (and GNU compatible) toolchain building them should be universal. Their respective buildsystems are already capable of handling platform differences already.
OpenSmalltalk · Mar 28, 2019 · 4bc3d72 · 4bc3d72
1 parent 68c1865
commit 4bc3d72
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 23 deletions.
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.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
@@ -22,15 +22,13 @@ $(THIRDPARTYLIBDIR)/$(LIBGIT2LIBNAME): $(LIBGIT2ARCHIVE)
 	tar x -f $(LIBGIT2ARCHIVE) -C $(THIRDPARTYDIR)
 	cp ../third-party/Toolchain-cross-mingw32-cygwin.cmake $(LIBGIT2DIR)
 	cd $(LIBGIT2DIR) \
-		&& cmake \
+		&& PKG_CONFIG_PATH=$(THIRDPARTYLIBDIR)/pkgconfig cmake \
 			-DCMAKE_TOOLCHAIN_FILE=./Toolchain-cross-mingw32-cygwin.cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \
 			-DUSE_SSH=ON \
 			-DBUILD_CLAR=OFF \
-			-DLIBSSH2_FOUND=ON \
-			-DLIBSSH2_INCLUDE_DIRS=$(THIRDPARTYINCLUDEDIR) \
-			-DLIBSSH2_LIBRARIES=$(THIRDPARTYLIBDIR)/libssh2-1.dll \
 			-DCMAKE_C_FLAGS="$(THIRDPARTY_CFLAGS)" \
+			-DOPENSSL_ROOT_DIR=$(THIRDPARTYOUTDIR) \
 		&& make \
 		&& make install