53 lines
2.7 KiB
Diff
53 lines
2.7 KiB
Diff
|
From 95590485d7cd95611eeac1fc06226d45f235c63a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Sun, 13 Sep 2020 22:09:49 +0200
|
||
|
|
Subject: [PATCH] CMakeLists.txt: pass DISABLE_STATIC to external/squirrel
|
||
|
|
|
||
|
|
external/squirrel will always build a static binary and library except
|
||
|
|
if DISABLE_STATIC is defined so define it to avoid the following build
|
||
|
|
failure with RELRO_FULL:
|
||
|
|
|
||
|
|
/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: CMakeFiles/sq_static.dir/sq.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIC
|
||
|
|
/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: final link failed: nonrepresentable section on output
|
||
|
|
collect2: error: ld returned 1 exit status
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- http://autobuild.buildroot.org/results/46e8f5e622ce450a89bc6d70f4bfd38182557901
|
||
|
|
- http://autobuild.buildroot.org/results/a43720492d817e4555d728546da9114e3ccba952
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 1ae0d653b..bb4358b01 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -411,6 +411,7 @@ ExternalProject_Add(squirrel
|
||
|
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||
|
|
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
|
||
|
|
-DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
|
||
|
|
+ -DDISABLE_STATIC=ON
|
||
|
|
-DINSTALL_INC_DIR=include)
|
||
|
|
|
||
|
|
if(WIN32)
|
||
|
|
@@ -424,10 +425,10 @@ if(WIN32)
|
||
|
|
#For debug run purposes
|
||
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc/run_supertux.bat.in" "${PROJECT_BINARY_DIR}/run_supertux.bat")
|
||
|
|
else()
|
||
|
|
- add_library(squirrel_lib STATIC IMPORTED)
|
||
|
|
- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||
|
|
- add_library(sqstdlib_lib STATIC IMPORTED)
|
||
|
|
- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||
|
|
+ add_library(squirrel_lib SHARED IMPORTED)
|
||
|
|
+ set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||
|
|
+ add_library(sqstdlib_lib SHARED IMPORTED)
|
||
|
|
+ set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
include_directories(SYSTEM ${SQUIRREL_PREFIX}/include)
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|