Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Prebuilt ]] Build Linux prebuilt libraries with position-independant code #6953

Merged
livecodeali merged 2 commits into from
Apr 24, 2019
Merged

[[ Prebuilt ]] Build Linux prebuilt libraries with position-independant code #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8133742
[[ Prebuilt ]] Enable -fPIC option when compiling Linux prebuilt libr…
livecodeian Apr 2, 2019
17637ac
[[ Prebuilt ]] Fix curl prebuild on windows when openssl has buildrev…
Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/linux-settings.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
[
Expand Down
7 changes: 6 additions & 1 deletion prebuilt/scripts/build-curl.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions prebuilt/scripts/platform.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions prebuilt/versions/curl_buildrevision
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PIC
2 changes: 1 addition & 1 deletion prebuilt/versions/icu_buildrevision
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1-PIC
1 change: 1 addition & 0 deletions prebuilt/versions/openssl_buildrevision
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PIC