Merge pull request #257 from murraystevenson/pythonOpenSSL11

Python : Fix linking against openssl11
GafferHQ · Feb 19, 2024 · 97414d1 · 97414d1
2 parents dd7afc6 + d13c745
commit 97414d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,7 +1,7 @@
 8.0.0 alpha x (relative to 8.0.0 alpha 7)
 -------------
 
-
+- Python : Fixed python binary unnecessarily linking against libssl in gcc9 builds.
 
 8.0.0 alpha 7 (relative to 8.0.0 alpha 6)
 -------------

diff --git a/Python/config.py b/Python/config.py
@@ -28,7 +28,7 @@
 
 	"commands" : [
 
-		"{environmentCommand} ./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi",
+		"./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi",
 		"make -j {jobs}",
 		"make install",
 
@@ -50,7 +50,6 @@
 	"variables" : {
 
 		"libraryType" : "--enable-shared",
-		"environmentCommand" : "",
 
 	},
 
@@ -60,17 +59,6 @@
 
 	],
 
-	"platform:linux" : {
-
-		"variables" : {
-
-			# Needed to build Python with OpenSSL 1.1.1 support on Centos 7
-			"environmentCommand" : "CPPFLAGS=\"$(pkg-config --cflags openssl11)\" LDFLAGS=\"$(pkg-config --libs openssl11)\""
-
-		}
-
-	},
-
 	"platform:macos" : {