Merge pull request #6953 from livecode/feature-linux-prebuilt-pic

livecodeali · web-flow · commit 95291c128de6 · 2019-04-24T20:29:45.000+01:00
[[ Prebuilt ]] Build Linux prebuilt libraries with position-independant code
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -30,7 +30,7 @@
 	'target_conditions':
 	[
 		[
-			'_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',
+			'_type' == "executable" or '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',
 			{
 				'cflags':
 				[
diff --git a/prebuilt/scripts/build-curl.bat b/prebuilt/scripts/build-curl.bat
@@ -44,7 +44,12 @@ cd "%CURL_SRC%"
 cd winbuild
 
 ECHO Preparing Curl for %BUILDTRIPLE%
-SET OPENSSL_TBZ=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%.tar.bz2
+IF DEFINED OpenSSL_BUILDREVISION (
+	SET OPENSSL_TBZ=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%-%OpenSSL_BUILDREVISION%.tar.bz2
+) ELSE (
+	SET OPENSSL_TBZ=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%.tar.bz2
+)
+
 IF NOT EXIST %OPENSSL_TBZ% (
 	ECHO OpenSSL must be built before Curl
 	EXIT /B 1
diff --git a/prebuilt/scripts/platform.inc b/prebuilt/scripts/platform.inc
@@ -114,14 +114,17 @@ function setCCForTarget {
 			else
 				CC_FLAGS_X86_NORELAX=
 			fi
-			echo "*DEBUG* CC_FLAGS: ${CC_FLAGS_X86_NORELAX}"
+			
+			CC_FLAGS="-fPIC ${CC_FLAGS_X86_NORELAX}"
+			
+			echo "*DEBUG* CC_FLAGS: ${CC_FLAGS}"
 			
 			if [ "${ARCH}" == "x86_64" ] ; then
-				CC="${CC_BASE} -m64 ${CC_FLAGS_X86_NORELAX}"
-				CXX="${CXX_BASE} -m64 ${CC_FLAGS_X86_NORELAX}"
+				CC="${CC_BASE} -m64 ${CC_FLAGS}"
+				CXX="${CXX_BASE} -m64 ${CC_FLAGS}"
 			elif [ "$1" == "x86" ] ; then
-				CC="${CC_BASE} -m32 ${CC_FLAGS_X86_NORELAX}"
-				CXX="${CXX_BASE} -m32 ${CC_FLAGS_X86_NORELAX}"
+				CC="${CC_BASE} -m32 ${CC_FLAGS}"
+				CXX="${CXX_BASE} -m32 ${CC_FLAGS}"
 			fi
 			;;
 		android)
diff --git a/prebuilt/versions/curl_buildrevision b/prebuilt/versions/curl_buildrevision
@@ -0,0 +1 @@
+PIC
diff --git a/prebuilt/versions/icu_buildrevision b/prebuilt/versions/icu_buildrevision
@@ -1 +1 @@
-1
+1-PIC
diff --git a/prebuilt/versions/openssl_buildrevision b/prebuilt/versions/openssl_buildrevision
@@ -0,0 +1 @@
+PIC

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`'target_conditions':`
`31`	`31`	`[`
`32`	`32`	`[`
`33`		`- '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',`
	`33`	`+ '_type' == "executable" or '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',`
`34`	`34`	`{`
`35`	`35`	`'cflags':`
`36`	`36`	`[`