forked from th0ma7/spksrc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Update fish to 3.3.1 (SynoCommunity#4815)
* feat: Update fish to 3.3.1 * Add fish license file and fix evansport build The evansport can't find pthreads.h error is actually a broken gold linker Co-authored-by: Sebastian Schmidt <publicarray@users.noreply.github.com>
- Loading branch information
1 parent
ad7b1b0
commit 0f034a8
Showing
4 changed files
with
32 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
fish-3.2.2.tar.xz SHA1 a30b2d21ebec63a00282181b8660224ce71edbad | ||
fish-3.2.2.tar.xz SHA256 5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009 | ||
fish-3.2.2.tar.xz MD5 606253699ce41991b03a93bcc6047d51 | ||
fish-3.3.1.tar.xz SHA1 2a220f67b8eee0e0f2439411e9cc6c0320970caa | ||
fish-3.3.1.tar.xz SHA256 b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89 | ||
fish-3.3.1.tar.xz MD5 94be285255aadfcf0f910bdcc2f56073 |
24 changes: 24 additions & 0 deletions
24
cross/fish/patches/i686/001-cmake-remove-gold-linker.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
--- fish-3.2.0/CMakeLists.txt 2021-03-01 23:47:02.000000000 +1100 | ||
+++ ./CMakeLists.txt 2021-04-10 13:12:07.280990507 +1000 | ||
@@ -51,22 +51,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} | ||
# Disable exception handling. | ||
add_compile_options(-fno-exceptions) | ||
|
||
-# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and | ||
-# _sys_errlist. They're also faster (significantly so in the case of lld). | ||
-if (UNIX) | ||
- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version | ||
- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION) | ||
- if ("${LD_VERSION}" MATCHES "LLD ") | ||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") | ||
- elseif (NOT APPLE) | ||
- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version | ||
- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION) | ||
- if ("${LD_VERSION}" MATCHES "GNU gold") | ||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold") | ||
- endif() | ||
- endif() | ||
-endif() | ||
- | ||
# Hide the CMake Rules directories in Xcode projects. | ||
source_group("CMake Rules" REGULAR_EXPRESSION "^$") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters