Merge pull request #7032 from livecodeian/feature-prebuilt-thirdparty-PIC

livecodeali · web-flow · commit f00d7e379e1d · 2019-06-03T23:07:06.000+01:00
[[ Prebuilt ]] Ensure linux thirdparty libs are prebuilt with position-independent code
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -29,15 +29,6 @@
 	# need to be compiled with the correct compilation flags
 	'target_conditions':
 	[
-		[
-			'_type' == "executable" or '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',
-			{
-				'cflags':
-				[
-					'-fPIC',
-				],
-			},
-		],
 		[
 			'server_mode == 0',
 			{
@@ -100,6 +91,7 @@
 	
 	'cflags':
 	[
+		'-fPIC',
 		'-fstrict-aliasing',
 		'-fvisibility=hidden',
 	],
diff --git a/prebuilt/scripts/lib_versions.bat b/prebuilt/scripts/lib_versions.bat
@@ -1,6 +1,6 @@
 REM # This file sets the libraries versions defined in versions/
 
-FOR %%L in (OpenSSL ICU CEF Curl) DO (
+FOR %%L in (Thirdparty OpenSSL ICU CEF Curl) DO (
 	SET PREBUILT_LIB=%%L
 	SET /P !PREBUILT_LIB!_VERSION=<versions\!PREBUILT_LIB!
 	IF EXIST "versions\!PREBUILT_LIB!_buildrevision" (
diff --git a/prebuilt/versions/thirdparty_buildrevision b/prebuilt/versions/thirdparty_buildrevision
@@ -0,0 +1 @@
+PIC

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,6 @@`
`29`	`29`	`# need to be compiled with the correct compilation flags`
`30`	`30`	`'target_conditions':`
`31`	`31`	`[`
`32`		`- [`
`33`		`- '_type' == "executable" or '_type == "loadable_module" or _type == "shared_library" or (_type == "static_library" and library_for_module != 0)',`
`34`		`- {`
`35`		`- 'cflags':`
`36`		`- [`
`37`		`- '-fPIC',`
`38`		`- ],`
`39`		`- },`
`40`		`- ],`
`41`	`32`	`[`
`42`	`33`	`'server_mode == 0',`
`43`	`34`	`{`
`@@ -100,6 +91,7 @@`
`100`	`91`
`101`	`92`	`'cflags':`
`102`	`93`	`[`
	`94`	`+ '-fPIC',`
`103`	`95`	`'-fstrict-aliasing',`
`104`	`96`	`'-fvisibility=hidden',`
`105`	`97`	`],`