From: Kevin Day <Kevin@kevux.org>
Date: Sun, 9 Feb 2025 05:08:51 +0000 (-0600)
Subject: Bugfix: Individual build problems with incorrect settings and dependencies.
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=4ef32f60d0955c25cf419233d37b8a615a70286e;p=fll

Bugfix: Individual build problems with incorrect settings and dependencies.

The `f_abstruse` is not being included in some cases.

The `individual_thread` is not being used in some cases and instead `individual-thread` is being used.
Make sure `individual_thread` is the only form used.

Remove `f_parse` inclusion where it is not needed.

Add missing `-lf_compare`.
---

diff --git a/level_1/fl_status_string/data/build/dependencies b/level_1/fl_status_string/data/build/dependencies
index b3af143..3d1b25b 100644
--- a/level_1/fl_status_string/data/build/dependencies
+++ b/level_1/fl_status_string/data/build/dependencies
@@ -8,5 +8,4 @@ f_utf
 f_type_array
 f_compare
 f_conversion
-f_parse
 f_status_string
diff --git a/level_1/fl_status_string/data/build/settings b/level_1/fl_status_string/data/build/settings
index fb76f26..cad6a3b 100644
--- a/level_1/fl_status_string/data/build/settings
+++ b/level_1/fl_status_string/data/build/settings
@@ -34,7 +34,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc
-build_libraries-individual -lf_compare -lf_conversion -lf_parse -lf_memory -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lf_compare -lf_conversion -lf_memory -lf_status_string -lf_string -lf_type_array -lf_utf
 
 build_sources_library status_string.c
 
diff --git a/level_1/fl_status_string/data/build/settings-tests b/level_1/fl_status_string/data/build/settings-tests
index 81b95dd..23fc922 100644
--- a/level_1/fl_status_string/data/build/settings-tests
+++ b/level_1/fl_status_string/data/build/settings-tests
@@ -23,7 +23,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lcmocka
-build_libraries-individual -lf_compare -lf_conversion -lf_memory -lf_parse -lf_status_string -lf_string -lf_type_array -lf_utf -lfl_status_string
+build_libraries-individual -lf_compare -lf_conversion -lf_memory -lf_status_string -lf_string -lf_type_array -lf_utf -lfl_status_string
 
 build_sources_program test-status_string-from.c
 build_sources_program test-status_string.c
diff --git a/level_2/fll_fss_status_string/data/build/dependencies b/level_2/fll_fss_status_string/data/build/dependencies
index 08085bc..eadb3fd 100644
--- a/level_2/fll_fss_status_string/data/build/dependencies
+++ b/level_2/fll_fss_status_string/data/build/dependencies
@@ -8,6 +8,5 @@ f_utf
 f_compare
 f_conversion
 f_fss
-f_parse
 f_status_string
 fl_status_string
diff --git a/level_2/fll_fss_status_string/data/build/settings b/level_2/fll_fss_status_string/data/build/settings
index 9f9e42c..d6c48bc 100644
--- a/level_2/fll_fss_status_string/data/build/settings
+++ b/level_2/fll_fss_status_string/data/build/settings
@@ -34,7 +34,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc
-build_libraries-individual -lfl_status_string -lf_compare -lf_conversion -lf_fss -lf_parse -lf_memory -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfl_status_string -lf_compare -lf_conversion -lf_fss -lf_memory -lf_status_string -lf_string -lf_type_array -lf_utf
 
 build_sources_library fss_status_string.c
 
diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index f78a442..86e64c6 100644
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -39,7 +39,7 @@ build_language c
 build_libraries -lc -lcap
 build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_print -lfll_program
 build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_path -lfl_print
-build_libraries-individual -lf_account -lf_capability -lf_color -lf_compare -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string  -lf_type_array -lf_utf
+build_libraries-individual -lf_abstruse -lf_account -lf_capability -lf_color -lf_compare -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string  -lf_type_array -lf_utf
 build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
diff --git a/level_3/fss_identify/data/build/dependencies b/level_3/fss_identify/data/build/dependencies
index b162338..775393c 100644
--- a/level_3/fss_identify/data/build/dependencies
+++ b/level_3/fss_identify/data/build/dependencies
@@ -6,6 +6,7 @@ f_memory
 f_type_array
 f_string
 f_utf
+f_abstruse
 f_color
 f_compare
 f_console
diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings
index 999d4ce..88691f8 100644
--- a/level_3/fss_identify/data/build/settings
+++ b/level_3/fss_identify/data/build/settings
@@ -34,7 +34,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_fss -lfl_print -lf_compare -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_parse -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_fss -lfl_print -lf_abstruse -lf_compare -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_parse -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
diff --git a/level_3/fss_write/data/build/dependencies b/level_3/fss_write/data/build/dependencies
index 1982441..5680633 100644
--- a/level_3/fss_write/data/build/dependencies
+++ b/level_3/fss_write/data/build/dependencies
@@ -6,6 +6,7 @@ f_memory
 f_type_array
 f_string
 f_utf
+f_abstruse
 f_color
 f_compare
 f_console
diff --git a/level_3/fss_write/data/build/settings b/level_3/fss_write/data/build/settings
index 9ad9129..eb13ef3 100644
--- a/level_3/fss_write/data/build/settings
+++ b/level_3/fss_write/data/build/settings
@@ -36,7 +36,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
diff --git a/level_3/fss_write/data/build/settings.basic b/level_3/fss_write/data/build/settings.basic
index 96c6b40..b075efa 100644
--- a/level_3/fss_write/data/build/settings.basic
+++ b/level_3/fss_write/data/build/settings.basic
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.basic_list b/level_3/fss_write/data/build/settings.basic_list
index 4402afc..f497f93 100644
--- a/level_3/fss_write/data/build/settings.basic_list
+++ b/level_3/fss_write/data/build/settings.basic_list
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.embedded_list b/level_3/fss_write/data/build/settings.embedded_list
index 6e87b2f..fb503a9 100644
--- a/level_3/fss_write/data/build/settings.embedded_list
+++ b/level_3/fss_write/data/build/settings.embedded_list
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.extended b/level_3/fss_write/data/build/settings.extended
index 6e1bb47..a3f7cdf 100644
--- a/level_3/fss_write/data/build/settings.extended
+++ b/level_3/fss_write/data/build/settings.extended
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.extended_list b/level_3/fss_write/data/build/settings.extended_list
index 41126e5..22501ba 100644
--- a/level_3/fss_write/data/build/settings.extended_list
+++ b/level_3/fss_write/data/build/settings.extended_list
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.main b/level_3/fss_write/data/build/settings.main
index 64a78ee..036d69b 100644
--- a/level_3/fss_write/data/build/settings.main
+++ b/level_3/fss_write/data/build/settings.main
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/fss_write/data/build/settings.payload b/level_3/fss_write/data/build/settings.payload
index d4c0e5f..30221d1 100644
--- a/level_3/fss_write/data/build/settings.payload
+++ b/level_3/fss_write/data/build/settings.payload
@@ -12,7 +12,7 @@ version_micro 1
 version_file micro
 version_target minor
 
-modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual-thread threadless
+modes individual level monolithic clang gcc gcc_13 test fanalyzer thread individual_thread threadless
 modes_default monolithic thread gcc
 
 build_compiler gcc
@@ -22,8 +22,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lfss_write
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
-build_libraries-individual-thread -lf_thread
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_parse -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 
diff --git a/level_3/status_code/data/build/settings.main b/level_3/status_code/data/build/settings.main
index ea7fcf1..5c3d7eb 100644
--- a/level_3/status_code/data/build/settings.main
+++ b/level_3/status_code/data/build/settings.main
@@ -33,7 +33,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lstatus_code
-build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_print -lfl_status_string -lf_color -lf_console -lf_conversion -lf_directory -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_print -lfl_status_string -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_rip -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-individual_thread -lf_thread
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll