EaStdC (#4)

Reviewed-on: #4
Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>

eathread/all/conandata.yml

@@ -0,0 +1,12 @@
+sources:
+  "25082026":
+    url: "https://github.com/electronicarts/EAThread/archive/a77e2276a3fe1489a7c6206c3f77ea10f7a5daf7.zip"
+    sha256: "19f6ed95e38e9580bcdcd8190a31952b9d27af7a7b27a9b86802cadb44ac4579"
+patches:
+  "25082026":
+    - patch_file: "patches/25082026-0001-use-conan.patch"
+      patch_description: "drop the submodule-only CommonCppFlags include and the FetchContent EABase pull, use cci's EABase, add install definitions"
+      patch_type: "conan"
+    - patch_file: "patches/25082026-0002-fix-char8t-thread-naming.patch"
+      patch_description: "unix thread-naming code used char8_t as a stand-in for plain char (a pre-C++20 convention) - fails to compile against char*-based strncpy/prctl/pthread_setname_np now that char8_t is a real, distinct type"
+      patch_type: "portability"

eathread/all/conanfile.py

@@ -0,0 +1,83 @@
+import os
+
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
+
+required_conan_version = ">=1.52.0"
+
+
+class EAThreadConan(ConanFile):
+    name = "eathread"
+    description = "EAThread is a C++ library that provides a platform-independent interface for threading."
+    topics = ("eastl", "threading")
+    license = "BSD-3-Clause"
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "https://github.com/electronicarts/EAThread"
+
+    package_type = "library"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "fPIC": True,
+    }
+
+    def export_sources(self):
+        export_conandata_patches(self)
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def configure(self):
+        if self.options.shared:
+            self.options.rm_safe("fPIC")
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def requirements(self):
+        self.requires(f"eabase/01082025@{self.user}/{self.channel}", transitive_headers=True)
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.generate()
+        CMakeDeps(self).generate()
+
+    def build(self):
+        apply_conandata_patches(self)
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        copy(
+            self,
+            "LICENSE",
+            src=self.source_folder,
+            dst=os.path.join(self.package_folder, "licenses"),
+        )
+        cmake = CMake(self)
+        cmake.install()
+        rmdir(self, os.path.join(self.package_folder, "doc"))
+
+    def package_info(self):
+        self.cpp_info.libs = ["EAThread"]
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.system_libs.append("pthread")
+
+        self.cpp_info.set_property("cmake_file_name", "EAThread")
+        self.cpp_info.set_property("cmake_target_name", "EAThread::EAThread")
+
+        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
+        self.cpp_info.filenames["cmake_find_package"] = "EAThread"
+        self.cpp_info.filenames["cmake_find_package_multi"] = "EAThread"
+        self.cpp_info.names["cmake_find_package"] = "EAThread"
+        self.cpp_info.names["cmake_find_package_multi"] = "EAThread"

eathread/all/patches/25082026-0001-use-conan.patch

@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7884456..6d51ebc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,6 @@ option(EATHREAD_BUILD_TESTS "Enable generation of build files for tests" OFF)
+ # Compiler Flags (TODO: do we really need this?)
+ #-------------------------------------------------------------------------------------------
+ set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts/Cmake" CACHE INTERNAL "Inject path to CommonCppFlags")
+-include(CommonCppFlags)
+ 
+ #-------------------------------------------------------------------------------------------
+ # Library definition
+@@ -36,16 +35,18 @@ target_include_directories(EAThread PUBLIC include)
+ #-------------------------------------------------------------------------------------------
+ # Package Dependencies
+ #-------------------------------------------------------------------------------------------
+-FetchContent_Declare(
+-  EABase
+-  GIT_REPOSITORY https://github.com/electronicarts/EABase.git
+-  GIT_TAG        123363eb82e132c0181ac53e43226d8ee76dea12
+-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
+-)
++find_package(EABase REQUIRED CONFIG)
++target_link_libraries(EAThread EABase::EABase)
+ 
+-FetchContent_MakeAvailable(EABase)
+-
+-target_link_libraries(EAThread EABase)
++#-------------------------------------------------------------------------------------------
++# Installation
++#-------------------------------------------------------------------------------------------
++include(GNUInstallDirs)
++install(TARGETS EAThread
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(DIRECTORY include/eathread DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ if(EATHREAD_BUILD_TESTS)
+     add_subdirectory(test)

eathread/all/patches/25082026-0002-fix-char8t-thread-naming.patch

@@ -0,0 +1,31 @@
+diff --git a/source/unix/eathread_unix.cpp b/source/unix/eathread_unix.cpp
+index 5be260a..f716caf 100644
+--- a/source/unix/eathread_unix.cpp
++++ b/source/unix/eathread_unix.cpp
+@@ -402,7 +402,7 @@
+ 		// This function is not currently used if the thread name can be set from any other thread
+ 		#if !EATHREAD_OTHER_THREAD_NAMING_SUPPORTED
+ 
+-			void SetCurrentThreadName(const char8_t* pName)
++			void SetCurrentThreadName(const char* pName)
+ 			{
+ 				#if defined(EA_PLATFORM_LINUX)
+ 					// http://manpages.courier-mta.org/htmlman2/prctl.2.html
+@@ -417,7 +417,7 @@
+ 					// (/proc/$PID/task/$TID/comm on newer kernels, /proc/$PID/task/$TID/stat's second field 
+ 					// on older kernels), and hence distinguish which thread might be responsible for the high 
+ 					// CPU load or similar problems.
+-					char8_t nameBuf[16]; // Limited to 16 bytes, null terminated if < 16 bytes
++					char nameBuf[16]; // Limited to 16 bytes, null terminated if < 16 bytes
+ 					strncpy(nameBuf, pName, sizeof(nameBuf));
+ 					nameBuf[15] = 0;
+ 					prctl(PR_SET_NAME, (unsigned long)nameBuf, 0, 0, 0);
+@@ -434,7 +434,7 @@
+ 					if(pthread_setname_np_ptr)
+ 					{
+ 						// Mac OS X does not expose the length limit of the name, so hardcode it.
+-						char8_t nameBuf[63]; // It is not clear what the size limit actually is, though 63 is known to work because it was seen on the Internet.
++						char nameBuf[63]; // It is not clear what the size limit actually is, though 63 is known to work because it was seen on the Internet.
+ 						strncpy(nameBuf, pName, sizeof(nameBuf));
+ 						nameBuf[62] = 0;
+ 						pthread_setname_np_ptr(nameBuf);

eathread/all/test_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package CXX)
+
+find_package(EAThread REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} EAThread::EAThread)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)

eathread/all/test_package/conanfile.py

@@ -0,0 +1,26 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def layout(self):
+        cmake_layout(self)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

eathread/all/test_package/test_package.cpp

@@ -0,0 +1,31 @@
+#include <eathread/eathread_thread.h>
+
+#include <cstdio>
+#include <cstdlib>
+
+namespace
+{
+intptr_t Increment(void* pContext)
+{
+    int* const pValue = static_cast<int*>(pContext);
+    *pValue += 1;
+    return 0;
+}
+}   // namespace
+
+int main()
+{
+    int value = 0;
+
+    EA::Thread::Thread thread;
+    thread.Begin(&Increment, &value);
+    thread.WaitForEnd();
+
+    if (value != 1)
+    {
+        std::fprintf(stderr, "Thread did not run as expected (value=%d)\n", value);
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}