zilti/guixchannel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
Daniel Ziltener 2024-04-16 01:43:40 +02:00
parent 22c26a2ae4
commit 95323a5d51
Signed by: zilti
GPG key ID: B38976E82C9DAE42
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch
View file

@ -1,26 +1,23 @@
diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
*** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200 *** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200
--- zig/CMakeLists.txt 2024-04-16 01:38:47.686554540 +0200 --- zig/CMakeLists.txt 2024-04-16 01:42:37.516459682 +0200
*************** ***************
*** 904,909 **** *** 906,911 ****
--- 904,912 ---- --- 906,912 ----
set(ZIG_PIE_ARG "")
endif()
+ # Use LIBRARY_PATH
+ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}")
+
# -Dno-langref is currently hardcoded because building the langref takes too damn long # -Dno-langref is currently hardcoded because building the langref takes too damn long
# To obtain these two forms of documentation, run zig build against stage3 rather than stage2. # To obtain these two forms of documentation, run zig build against stage3 rather than stage2.
+ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}")
set(ZIG_BUILD_ARGS set(ZIG_BUILD_ARGS
--zig-lib-dir "${CMAKE_SOURCE_DIR}/lib"
"-Dconfig_h=${ZIG_CONFIG_H_OUT}"
*************** ***************
*** 919,924 **** *** 919,924 ****
--- 922,929 ---- --- 920,926 ----
"-Dtarget=${ZIG_TARGET_TRIPLE}" "-Dtarget=${ZIG_TARGET_TRIPLE}"
"-Dcpu=${ZIG_TARGET_MCPU}" "-Dcpu=${ZIG_TARGET_MCPU}"
"-Dversion-string=${RESOLVED_ZIG_VERSION}" "-Dversion-string=${RESOLVED_ZIG_VERSION}"
+ --search-prefix $<JOIN:LIBRARY_PATH," --search-prefix"> + --search-prefix $<JOIN:LIBRARY_PATH," --search-prefix">
+ ${SEARCH_PREFIXES}
) )
add_custom_target(stage3 ALL add_custom_target(stage3 ALL