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 6b3991e876717fc921480fafad6ff625aeeeb656..1bae42cc3d36390773b06131d3237e18d1072bdc 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 09294b2a91d42dbc107e9e61ae41818de4388fc2..a863aefc5c8fbcffe56a7b4f95dd04a1b12058e6 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
@@ -115,6 +116,7 @@ defines -D_support_controller_controlfile_
 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_
 

diff --git a/data/build/settings.controller b/data/build/settings.controller
index 3772ca018ac6ec0c49edccb346767beb868a10a1..89c8466a1d8ac8d7e1d6c136e40b30c5ac87fe25 100644 (file)
--- a/data/build/settings.controller
+++ b/data/build/settings.controller
@@ -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
@@ -79,6 +80,7 @@ defines -D_support_controller_controlfile_
 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_
 

diff --git a/data/build/settings.init b/data/build/settings.init
index 3949cf2d40957aa6853c9cfa12881fe58c9f1fa4..7c21f1cb7b5a2a3b78b44ae48116f1615b4b3380 100644 (file)
--- a/data/build/settings.init
+++ b/data/build/settings.init
@@ -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
@@ -79,6 +80,7 @@ defines -D_support_controller_controlfile_
 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_
 

diff --git a/data/build/stand_alone/fakefile b/data/build/stand_alone/fakefile
index a381bef464dd70c182a045bce3524d44e0476bde..d9c1c9b2597c1f0e1774a144047a316e681b03df 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.controller b/data/build/stand_alone/settings.controller
index e812185b30eab3e0444e026aee021c8d4b656d6c..17c933f5af2218f3ca030d03eff1eab4e74d65bc 100644 (file)
--- a/data/build/stand_alone/settings.controller
+++ b/data/build/stand_alone/settings.controller
@@ -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 4
 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
@@ -145,6 +146,7 @@ defines -D_support_controller_controlfile_
 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_
 

diff --git a/data/build/stand_alone/settings.init b/data/build/stand_alone/settings.init
index 4ca0f6ad47f2d002357374f048163b3a590b7b9e..c7a1ce35a9450af645362c4feaea4951c3e33baa 100644 (file)
--- a/data/build/stand_alone/settings.init
+++ b/data/build/stand_alone/settings.init
@@ -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 4
 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
@@ -145,6 +146,7 @@ defines -D_support_controller_controlfile_
 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_