Update: Add pinephone build mode and fix build setting inconsistencies encountered.

Add a convenience build mode similar to the `android` build mode for the `pinephone`.
Just like with the `android` build mode, add a parameter to build using the `pinephone` mode to the `bootstrap-example.sh` script.
Utilize the android build variables for the script, replacing them with a more generic variable name.

I discovered and addressed some build settings inconsistencies while mass adding the `pinephone` mode.

diff --git a/data/build/fakefile b/data/build/fakefile
index 2e14b9c53302ebc209dcd8f0650f3fac7378b494..af292e5b17c9f81ee4d9bb7496701ff722785c6c 100644 (file)
--- a/data/build/fakefile
+++ b/data/build/fakefile
@@ -2,7 +2,7 @@
 
 settings:
   fail exit
-  modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic test thread threadless
+  modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic pinephone test thread threadless
 
   environment PATH LD_LIBRARY_PATH
   environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH

diff --git a/data/build/settings b/data/build/settings
index 8963a7a10b71252fe9c7747ada25b15de105efa0..88a625bed0bacb4caea29cc4c257dd46e0999dd4 100644 (file)
--- a/data/build/settings
+++ b/data/build/settings
@@ -12,6 +12,7 @@
 #   - individual_thread: This is required when compiling in individual mode with "thread" mode.
 #   - level:             Compile using per level libraries.
 #   - monolithic:        Compile using per monolithic libraries.
+#   - pinephone:         Compile on a pinephone system.
 #   - test:              Compile for a test, such as unit testing.
 #   - thread:            Compile with thread support.
 #   - threadless:        Compile without thread support.
@@ -25,7 +26,7 @@ version_micro 4
 version_file micro
 version_target minor
 
-modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic test thread threadless
+modes android clang coverage debug fanalyzer flex_arrays gcc individual individual_thread level monolithic pinephone test thread threadless
 modes_default debug gcc monolithic thread
 
 build_compiler gcc
@@ -75,8 +76,10 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L
 
 #defines -D_di_libcap_
 defines -D_libcap_legacy_only_
-defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_  -D_di_f_thread_mutex_consistent_ -D_di_f_thread_mutex_attribute_robust_get_ -D_di_f_thread_mutex_attribute_robust_set_ -D_pthread_kill_as_pthread_cancel_
+defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_  -D_di_f_thread_mutex_consistent_ -D_di_f_thread_mutex_attribute_robust_get_ -D_di_f_thread_mutex_attribute_robust_set_ -D_pthread_kill_as_pthread_cancel_defines-debug -D_en_f_status_debug_
+defines-clang -D_clang_not_a_compile_time_constant_workaround_
 defines-debug -D_en_f_status_debug_
+defines-pinephone -D_di_f_thread_mutex_attribute_priority_ceiling_get_ -D_di_f_thread_mutex_attribute_priority_ceiling_set_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 defines-threadless -D_di_thread_support_
 

diff --git a/data/build/stand_alone/fakefile b/data/build/stand_alone/fakefile
index a1a84eaa8d7ef9ac7d610f7d9fa6b8f0cf32e6f9..10a4b44602206c25bb7a7a785f1f65948243f2cf 100644 (file)
--- a/data/build/stand_alone/fakefile
+++ b/data/build/stand_alone/fakefile
@@ -13,7 +13,7 @@
 
 settings:
   fail exit
-  modes android clang coverage debug fanalyzer flex_arrays gcc test thread threadless
+  modes android clang coverage debug fanalyzer flex_arrays gcc pinephone test thread threadless
 
   environment PATH LD_LIBRARY_PATH
   environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH

diff --git a/data/build/stand_alone/settings.firewall b/data/build/stand_alone/settings.firewall
index 32243e64e7504764b4e9f3c730f1707617dd2cf2..74238536f8a20c7b0c458fd40325dd8123979932 100644 (file)
--- a/data/build/stand_alone/settings.firewall
+++ b/data/build/stand_alone/settings.firewall
@@ -13,6 +13,7 @@
 #   - fanalyzer:   Compile using GCC's -fanalyzer compile time option.
 #   - flex_arrays: Use GCC strict flex arrays (supported by GCC version 13 or greater).
 #   - gcc:         Use GCC specific settings.
+#   - pinephone:   Compile on a pinephone system.
 #   - test:        Compile for a test, such as unit testing.
 #   - thread:      Compile with thread support.
 #   - threadless:  Compile without thread support.
@@ -27,7 +28,7 @@ version_micro 0
 version_file micro
 version_target minor
 
-modes android clang coverage debug fanalyzer flex_arrays gcc test thread threadless
+modes android clang coverage debug fanalyzer flex_arrays gcc pinephone test thread threadless
 modes_default debug gcc thread
 
 build_compiler gcc
@@ -119,6 +120,7 @@ defines -D_libcap_legacy_only_
 defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_  -D_di_f_thread_mutex_consistent_ -D_di_f_thread_mutex_attribute_robust_get_ -D_di_f_thread_mutex_attribute_robust_set_ -D_pthread_kill_as_pthread_cancel_
 defines-clang -D_clang_not_a_compile_time_constant_workaround_
 defines-debug -D_en_f_status_debug_
+defines-pinephone -D_di_f_thread_mutex_attribute_priority_ceiling_get_ -D_di_f_thread_mutex_attribute_priority_ceiling_set_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 defines-threadless -D_di_thread_support_