From 719d4856c8787181d98f5cf26feddc1aaaa48b9f Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 15 Dec 2025 20:18:43 -0600 Subject: [PATCH] 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. --- data/build/fakefile | 2 +- data/build/settings | 4 +++- data/build/settings.controller | 4 +++- data/build/settings.init | 4 +++- data/build/stand_alone/fakefile | 2 +- data/build/stand_alone/settings.controller | 4 +++- data/build/stand_alone/settings.init | 4 +++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/data/build/fakefile b/data/build/fakefile index 6b3991e..1bae42c 100644 --- 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 09294b2..a863aef 100644 --- 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 3772ca0..89c8466 100644 --- 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 3949cf2..7c21f1c 100644 --- 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 a381bef..d9c1c9b 100644 --- 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 e812185..17c933f 100644 --- 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 4ca0f6a..c7a1ce3 100644 --- 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_ -- 1.8.3.1