From 5a64b7785a21fd5609e2234d8ca4ab0060cb8e3e Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 8 May 2025 21:47:39 -0500 Subject: [PATCH] Bugfix: Relocate static libcap linkage to after the libfll linkage. The parameter order apparently matters when it comes to linking static libraries. Perhaps the `-l:libXXX.a` format (instead of `-lXXX`) is where this order somehow matters. --- data/build/settings | 7 ++++--- data/build/settings.controller | 7 ++++--- data/build/settings.init | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/data/build/settings b/data/build/settings index fc94f7b..89ef923 100644 --- a/data/build/settings +++ b/data/build/settings @@ -42,14 +42,15 @@ build_libraries_shared-individual_thread -lf_thread build_libraries_shared-level -lfll_2 -lfll_1 -lfll_0 build_libraries_shared-monolithic -lfll -build_libraries_static -l:libc.a -l:libcap.a +build_libraries_static -l:libc.a build_libraries_static-individual -l:libfll_control_group.a -l:libfll_error.a -l:libfll_execute.a -l:libfll_fss.a -l:libfll_print.a -l:libfll_program.a build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-individual -l:libfl_control_group.a -l:libfl_conversion.a -l:libfl_directory.a -l:libfl_environment.a -l:libfl_execute.a -l:libfl_fss.a -l:libfl_iki.a -l:libfl_path.a -l:libfl_print.a build_libraries_static-individual -l:libf_abstruse.a -l:libf_account.a -l:libf_capability.a -l:libf_color.a -l:libf_compare.a -l:libf_console.a -l:libf_control_group.a -l:libf_conversion.a -l:libf_directory.a -l:libf_environment.a -l:libf_execute.a -l:libf_file.a -l:libf_fss.a -l:libf_iki.a -l:libf_limit.a -l:libf_memory.a -l:libf_parse.a -l:libf_path.a -l:libf_pipe.a -l:libf_print.a -l:libf_rip.a -l:libf_signal.a -l:libf_socket.a -l:libf_string.a -l:libf_time.a -l:libf_type_array.a -l:libf_utf.a +build_libraries_static-individual -l:libcap.a build_libraries_static-individual_thread -l:libf_thread.a -build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -build_libraries_static-monolithic -l:libfll.a +build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a +build_libraries_static-monolithic -l:libfll.a -l:libcap.a build_sources_library common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c build_sources_library common/type/cache.c common/type/control.c common/type/entry.c common/type/execute.c common/type/instance.c common/type/interrupt.c common/type/lock.c common/type/process.c common/type/rule.c common/type/thread.c diff --git a/data/build/settings.controller b/data/build/settings.controller index 4b52fe7..e937189 100644 --- a/data/build/settings.controller +++ b/data/build/settings.controller @@ -42,14 +42,15 @@ build_libraries_shared-individual_thread -lf_thread build_libraries_shared-level -lfll_2 -lfll_1 -lfll_0 build_libraries_shared-monolithic -lfll -build_libraries_static -l:libc.a -l:libcap.a -l:libcontroller.a +build_libraries_static -l:libc.a -l:libcontroller.a build_libraries_static-individual -l:libfll_control_group.a -l:libfll_error.a -l:libfll_execute.a -l:libfll_fss.a -l:libfll_print.a -l:libfll_program.a build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-individual -l:libfl_control_group.a -l:libfl_conversion.a -l:libfl_directory.a -l:libfl_environment.a -l:libfl_execute.a -l:libfl_fss.a -l:libfl_iki.a -l:libfl_path.a -l:libfl_print.a build_libraries_static-individual -l:libf_abstruse.a -l:libf_account.a -l:libf_capability.a -l:libf_color.a -l:libf_compare.a -l:libf_console.a -l:libf_control_group.a -l:libf_conversion.a -l:libf_directory.a -l:libf_environment.a -l:libf_execute.a -l:libf_file.a -l:libf_fss.a -l:libf_iki.a -l:libf_limit.a -l:libf_memory.a -l:libf_parse.a -l:libf_path.a -l:libf_pipe.a -l:libf_print.a -l:libf_rip.a -l:libf_signal.a -l:libf_socket.a -l:libf_string.a -l:libf_time.a -l:libf_type_array.a -l:libf_utf.a +build_libraries_static-individual -l:libcap.a build_libraries_static-individual_thread -l:libf_thread.a -build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -build_libraries_static-monolithic -l:libfll.a +build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a +build_libraries_static-monolithic -l:libfll.a -l:libcap.a build_sources_program config.c main.c controller.c string.c diff --git a/data/build/settings.init b/data/build/settings.init index c4085bc..13af881 100644 --- a/data/build/settings.init +++ b/data/build/settings.init @@ -42,14 +42,15 @@ build_libraries_shared-individual_thread -lf_thread build_libraries_shared-level -lfll_2 -lfll_1 -lfll_0 build_libraries_shared-monolithic -lfll -build_libraries_static -l:libc.a -l:libcap.a -l:libcontroller.a +build_libraries_static -l:libc.a -l:libcontroller.a build_libraries_static-individual -l:libfll_control_group.a -l:libfll_error.a -l:libfll_execute.a -l:libfll_fss.a -l:libfll_print.a -l:libfll_program.a build_libraries_static-individual_thread -l:libf_thread.a build_libraries_static-individual -l:libfl_control_group.a -l:libfl_conversion.a -l:libfl_directory.a -l:libfl_environment.a -l:libfl_execute.a -l:libfl_fss.a -l:libfl_iki.a -l:libfl_path.a -l:libfl_print.a build_libraries_static-individual -l:libf_abstruse.a -l:libf_account.a -l:libf_capability.a -l:libf_color.a -l:libf_compare.a -l:libf_console.a -l:libf_control_group.a -l:libf_conversion.a -l:libf_directory.a -l:libf_environment.a -l:libf_execute.a -l:libf_file.a -l:libf_fss.a -l:libf_iki.a -l:libf_limit.a -l:libf_memory.a -l:libf_parse.a -l:libf_path.a -l:libf_pipe.a -l:libf_print.a -l:libf_rip.a -l:libf_signal.a -l:libf_socket.a -l:libf_string.a -l:libf_time.a -l:libf_type_array.a -l:libf_utf.a +build_libraries_static-individual -l:libcap.a build_libraries_static-individual_thread -l:libf_thread.a -build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -build_libraries_static-monolithic -l:libfll.a +build_libraries_static-level -l:libfll_2.a -l:libfll_1.a -l:libfll_0.a -l:libcap.a +build_libraries_static-monolithic -l:libfll.a -l:libcap.a build_sources_program config.c main.c init.c string.c -- 1.8.3.1