diff --git a/devel/eastl/Makefile b/devel/eastl/Makefile index 066587b90fe6..395181952b27 100644 --- a/devel/eastl/Makefile +++ b/devel/eastl/Makefile @@ -1,43 +1,44 @@ PORTNAME= eastl -DISTVERSION= 3.21.12-9 -DISTVERSIONSUFFIX= -g089eb20 +DISTVERSION= 3.21.23 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Electronic Arts Standard Template Library WWW= https://github.com/electronicarts/EASTL LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= aarch64 riscv64 NOT_FOR_ARCHS_REASON= test/packages/EABase/include/Common/EABase/config/eaplatform.h:436:4: error: Unknown processor USES= cmake compiler:c++17-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= electronicarts GH_PROJECT= ${PORTNAME:tu} GH_TUPLE= electronicarts:EAAssert:e5e1812:EAAssert/test/packages/EAAssert \ - electronicarts:EABase:521cb05:EABase/test/packages/EABase \ + electronicarts:EABase:123363eb82e132c0181ac53e43226d8ee76dea12:EABase/EABase \ electronicarts:EAMain:24ca8bf:EAMain/test/packages/EAMain \ electronicarts:EAStdC:8dc9e31:EAStdC/test/packages/EAStdC \ electronicarts:EATest:a59b372:EATest/test/packages/EATest \ electronicarts:EAThread:e4367a3:EAThread/test/packages/EAThread CMAKE_ON= BUILD_SHARED_LIBS +CXXFLAGS+= -isystem ${WRKSRC}/EABase/include/Common + do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DEASTL_BUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ cd test && ctest -C ${CMAKE_BUILD_TYPE} benchmark: build @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DEASTL_BUILD_BENCHMARK=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ cd benchmark && ctest -C ${CMAKE_BUILD_TYPE} .include diff --git a/devel/eastl/distinfo b/devel/eastl/distinfo index 09029c2816a6..38077cdc405d 100644 --- a/devel/eastl/distinfo +++ b/devel/eastl/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1690389308 -SHA256 (electronicarts-EASTL-3.21.12-9-g089eb20_GH0.tar.gz) = 9898d50426989cfa276566d48ede1f00a71a8f65e4c8da19cef23b1e28383814 -SIZE (electronicarts-EASTL-3.21.12-9-g089eb20_GH0.tar.gz) = 1632921 +TIMESTAMP = 1725176907 +SHA256 (electronicarts-EASTL-3.21.23_GH0.tar.gz) = 2bcb48f88f7daf9f91c165aae751c10d11d6959b6e10f2dda8f1db893e684022 +SIZE (electronicarts-EASTL-3.21.23_GH0.tar.gz) = 1654453 SHA256 (electronicarts-EAAssert-e5e1812_GH0.tar.gz) = 8660218682e7712587af0f59dc5826727b56072d3221be20fcaea91fd6726046 SIZE (electronicarts-EAAssert-e5e1812_GH0.tar.gz) = 15403 -SHA256 (electronicarts-EABase-521cb05_GH0.tar.gz) = 7da80c0b4dce8fe2fee677cacdd257366fcd9b2769a7ca375825f7a44df33e13 -SIZE (electronicarts-EABase-521cb05_GH0.tar.gz) = 105291 +SHA256 (electronicarts-EABase-123363eb82e132c0181ac53e43226d8ee76dea12_GH0.tar.gz) = eff0503085ab144f4a24e29ff1d2401aece6e0f680d82bdcc6018182d5d1e0b3 +SIZE (electronicarts-EABase-123363eb82e132c0181ac53e43226d8ee76dea12_GH0.tar.gz) = 107522 SHA256 (electronicarts-EAMain-24ca8bf_GH0.tar.gz) = 13537f4b20a75c782f32049c6a989abf6e5dc499f2c951475040142a390d20aa SIZE (electronicarts-EAMain-24ca8bf_GH0.tar.gz) = 34122 SHA256 (electronicarts-EAStdC-8dc9e31_GH0.tar.gz) = 35417ad9c28237186a1a935191f4a2a90165f9ed4921e6ab819c866cf2c29654 SIZE (electronicarts-EAStdC-8dc9e31_GH0.tar.gz) = 564039 SHA256 (electronicarts-EATest-a59b372_GH0.tar.gz) = 0a7f74b727103c8aa8a6fce80435b8647bb0396256388aef1a8d0baac2195389 SIZE (electronicarts-EATest-a59b372_GH0.tar.gz) = 37119 SHA256 (electronicarts-EAThread-e4367a3_GH0.tar.gz) = 166bf97bfbd7ff543fe8d6356b308544f14385154dde8859f75efba8f12e3982 SIZE (electronicarts-EAThread-e4367a3_GH0.tar.gz) = 282041 diff --git a/devel/eastl/files/patch-CMakeLists.txt b/devel/eastl/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..6b17053a8bbd --- /dev/null +++ b/devel/eastl/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2024-09-01 08:01:04 UTC ++++ CMakeLists.txt +@@ -70,6 +70,7 @@ target_include_directories(EASTL PUBLIC include) + #------------------------------------------------------------------------------------------- + # Dependencies + #------------------------------------------------------------------------------------------- ++if (FALSE) + FetchContent_Declare( + EABase + GIT_REPOSITORY https://github.com/electronicarts/EABase.git +@@ -78,6 +79,9 @@ FetchContent_MakeAvailable(EABase) + ) + + FetchContent_MakeAvailable(EABase) ++else() ++ add_subdirectory(EABase) ++endif() + + target_link_libraries(EASTL EABase) + diff --git a/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h b/devel/eastl/files/patch-EABase_include_Common_EABase_config_eaplatform.h similarity index 71% rename from devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h rename to devel/eastl/files/patch-EABase_include_Common_EABase_config_eaplatform.h index 1eb9a584c856..e07e40696266 100644 --- a/devel/eastl/files/patch-test_packages_EABase_include_Common_EABase_config_eaplatform.h +++ b/devel/eastl/files/patch-EABase_include_Common_EABase_config_eaplatform.h @@ -1,14 +1,14 @@ ---- test/packages/EABase/include/Common/EABase/config/eaplatform.h.orig 2022-02-09 23:55:09 UTC -+++ test/packages/EABase/include/Common/EABase/config/eaplatform.h +--- EABase/include/Common/EABase/config/eaplatform.h.orig 2024-09-01 08:32:08 UTC ++++ EABase/include/Common/EABase/config/eaplatform.h @@ -454,6 +454,11 @@ #define EA_PROCESSOR_POWERPC_32 1 #define EA_SYSTEM_BIG_ENDIAN 1 #define EA_PLATFORM_DESCRIPTION "BSD on PowerPC" + #elif defined(__arm__) + #define EA_ABI_ARM_LINUX 1 // a.k.a. "ARM eabi" + #define EA_PROCESSOR_ARM32 1 + #define EA_SYSTEM_LITTLE_ENDIAN 1 + #define EA_PLATFORM_DESCRIPTION "BSD on ARM" #else #error Unknown processor #error Unknown endianness diff --git a/devel/eastl/pkg-plist b/devel/eastl/pkg-plist index f413892055b9..a4d5435d8ab7 100644 --- a/devel/eastl/pkg-plist +++ b/devel/eastl/pkg-plist @@ -1,271 +1,273 @@ include/EABase/config/eacompiler.h include/EABase/config/eacompilertraits.h include/EABase/config/eaplatform.h include/EABase/config/eaplatform.h.orig include/EABase/eabase.h +include/EABase/eadeprecated.h include/EABase/eahave.h include/EABase/earesult.h include/EABase/eastdarg.h include/EABase/eaunits.h include/EABase/int128.h include/EABase/nullptr.h include/EABase/version.h include/EASTL/algorithm.h include/EASTL/allocator.h include/EASTL/allocator_malloc.h include/EASTL/any.h include/EASTL/array.h include/EASTL/atomic.h include/EASTL/bit.h include/EASTL/bitset.h include/EASTL/bitvector.h include/EASTL/bonus/adaptors.h include/EASTL/bonus/call_traits.h include/EASTL/bonus/compressed_pair.h include/EASTL/bonus/fixed_ring_buffer.h include/EASTL/bonus/fixed_tuple_vector.h include/EASTL/bonus/intrusive_sdlist.h include/EASTL/bonus/intrusive_slist.h include/EASTL/bonus/list_map.h include/EASTL/bonus/lru_cache.h include/EASTL/bonus/overloaded.h include/EASTL/bonus/ring_buffer.h include/EASTL/bonus/sort_extra.h include/EASTL/bonus/tuple_vector.h include/EASTL/chrono.h include/EASTL/compare.h include/EASTL/core_allocator.h include/EASTL/core_allocator_adapter.h include/EASTL/deque.h include/EASTL/finally.h include/EASTL/fixed_allocator.h include/EASTL/fixed_function.h include/EASTL/fixed_hash_map.h include/EASTL/fixed_hash_set.h include/EASTL/fixed_list.h include/EASTL/fixed_map.h include/EASTL/fixed_set.h include/EASTL/fixed_slist.h include/EASTL/fixed_string.h include/EASTL/fixed_substring.h include/EASTL/fixed_vector.h include/EASTL/functional.h include/EASTL/hash_map.h include/EASTL/hash_set.h include/EASTL/heap.h include/EASTL/initializer_list.h include/EASTL/internal/atomic/arch/arch.h include/EASTL/internal/atomic/arch/arch_add_fetch.h include/EASTL/internal/atomic/arch/arch_and_fetch.h include/EASTL/internal/atomic/arch/arch_cmpxchg_strong.h include/EASTL/internal/atomic/arch/arch_cmpxchg_weak.h include/EASTL/internal/atomic/arch/arch_compiler_barrier.h include/EASTL/internal/atomic/arch/arch_cpu_pause.h include/EASTL/internal/atomic/arch/arch_exchange.h include/EASTL/internal/atomic/arch/arch_fetch_add.h include/EASTL/internal/atomic/arch/arch_fetch_and.h include/EASTL/internal/atomic/arch/arch_fetch_or.h include/EASTL/internal/atomic/arch/arch_fetch_sub.h include/EASTL/internal/atomic/arch/arch_fetch_xor.h include/EASTL/internal/atomic/arch/arch_load.h include/EASTL/internal/atomic/arch/arch_memory_barrier.h include/EASTL/internal/atomic/arch/arch_or_fetch.h include/EASTL/internal/atomic/arch/arch_signal_fence.h include/EASTL/internal/atomic/arch/arch_store.h include/EASTL/internal/atomic/arch/arch_sub_fetch.h include/EASTL/internal/atomic/arch/arch_thread_fence.h include/EASTL/internal/atomic/arch/arch_xor_fetch.h include/EASTL/internal/atomic/arch/arm/arch_arm.h include/EASTL/internal/atomic/arch/arm/arch_arm_load.h include/EASTL/internal/atomic/arch/arm/arch_arm_memory_barrier.h include/EASTL/internal/atomic/arch/arm/arch_arm_store.h include/EASTL/internal/atomic/arch/arm/arch_arm_thread_fence.h include/EASTL/internal/atomic/arch/x86/arch_x86.h include/EASTL/internal/atomic/arch/x86/arch_x86_add_fetch.h include/EASTL/internal/atomic/arch/x86/arch_x86_and_fetch.h include/EASTL/internal/atomic/arch/x86/arch_x86_cmpxchg_strong.h include/EASTL/internal/atomic/arch/x86/arch_x86_cmpxchg_weak.h include/EASTL/internal/atomic/arch/x86/arch_x86_exchange.h include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_add.h include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_and.h include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_or.h include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_sub.h include/EASTL/internal/atomic/arch/x86/arch_x86_fetch_xor.h include/EASTL/internal/atomic/arch/x86/arch_x86_load.h include/EASTL/internal/atomic/arch/x86/arch_x86_memory_barrier.h include/EASTL/internal/atomic/arch/x86/arch_x86_or_fetch.h include/EASTL/internal/atomic/arch/x86/arch_x86_store.h include/EASTL/internal/atomic/arch/x86/arch_x86_sub_fetch.h include/EASTL/internal/atomic/arch/x86/arch_x86_thread_fence.h include/EASTL/internal/atomic/arch/x86/arch_x86_xor_fetch.h include/EASTL/internal/atomic/atomic.h include/EASTL/internal/atomic/atomic_asserts.h include/EASTL/internal/atomic/atomic_base_width.h include/EASTL/internal/atomic/atomic_casts.h include/EASTL/internal/atomic/atomic_flag.h include/EASTL/internal/atomic/atomic_flag_standalone.h include/EASTL/internal/atomic/atomic_integral.h include/EASTL/internal/atomic/atomic_macros.h include/EASTL/internal/atomic/atomic_macros/atomic_macros.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_add_fetch.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_and_fetch.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_base.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_cmpxchg_strong.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_cmpxchg_weak.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_compiler_barrier.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_cpu_pause.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_exchange.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_add.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_and.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_or.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_sub.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_fetch_xor.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_load.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_memory_barrier.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_or_fetch.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_signal_fence.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_store.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_sub_fetch.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_thread_fence.h include/EASTL/internal/atomic/atomic_macros/atomic_macros_xor_fetch.h include/EASTL/internal/atomic/atomic_memory_order.h include/EASTL/internal/atomic/atomic_pointer.h include/EASTL/internal/atomic/atomic_size_aligned.h include/EASTL/internal/atomic/atomic_standalone.h include/EASTL/internal/atomic/compiler/compiler.h include/EASTL/internal/atomic/compiler/compiler_add_fetch.h include/EASTL/internal/atomic/compiler/compiler_and_fetch.h include/EASTL/internal/atomic/compiler/compiler_barrier.h include/EASTL/internal/atomic/compiler/compiler_cmpxchg_strong.h include/EASTL/internal/atomic/compiler/compiler_cmpxchg_weak.h include/EASTL/internal/atomic/compiler/compiler_cpu_pause.h include/EASTL/internal/atomic/compiler/compiler_exchange.h include/EASTL/internal/atomic/compiler/compiler_fetch_add.h include/EASTL/internal/atomic/compiler/compiler_fetch_and.h include/EASTL/internal/atomic/compiler/compiler_fetch_or.h include/EASTL/internal/atomic/compiler/compiler_fetch_sub.h include/EASTL/internal/atomic/compiler/compiler_fetch_xor.h include/EASTL/internal/atomic/compiler/compiler_load.h include/EASTL/internal/atomic/compiler/compiler_memory_barrier.h include/EASTL/internal/atomic/compiler/compiler_or_fetch.h include/EASTL/internal/atomic/compiler/compiler_signal_fence.h include/EASTL/internal/atomic/compiler/compiler_store.h include/EASTL/internal/atomic/compiler/compiler_sub_fetch.h include/EASTL/internal/atomic/compiler/compiler_thread_fence.h include/EASTL/internal/atomic/compiler/compiler_xor_fetch.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_add_fetch.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_and_fetch.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_barrier.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cmpxchg_strong.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cmpxchg_weak.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_cpu_pause.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_exchange.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_add.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_and.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_or.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_sub.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_fetch_xor.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_load.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_or_fetch.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_signal_fence.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_store.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_sub_fetch.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_thread_fence.h include/EASTL/internal/atomic/compiler/gcc/compiler_gcc_xor_fetch.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_add_fetch.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_and_fetch.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_barrier.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cmpxchg_strong.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cmpxchg_weak.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_cpu_pause.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_exchange.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_add.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_and.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_or.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_sub.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_fetch_xor.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_or_fetch.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_signal_fence.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_sub_fetch.h include/EASTL/internal/atomic/compiler/msvc/compiler_msvc_xor_fetch.h include/EASTL/internal/char_traits.h +include/EASTL/internal/concepts.h include/EASTL/internal/config.h include/EASTL/internal/copy_help.h include/EASTL/internal/enable_shared.h include/EASTL/internal/fill_help.h include/EASTL/internal/fixed_pool.h include/EASTL/internal/function.h include/EASTL/internal/function_detail.h include/EASTL/internal/function_help.h include/EASTL/internal/functional_base.h include/EASTL/internal/generic_iterator.h include/EASTL/internal/hashtable.h include/EASTL/internal/in_place_t.h include/EASTL/internal/integer_sequence.h include/EASTL/internal/intrusive_hashtable.h include/EASTL/internal/mem_fn.h include/EASTL/internal/memory_base.h include/EASTL/internal/move_help.h include/EASTL/internal/pair_fwd_decls.h include/EASTL/internal/piecewise_construct_t.h include/EASTL/internal/red_black_tree.h include/EASTL/internal/smart_ptr.h include/EASTL/internal/thread_support.h include/EASTL/internal/tuple_fwd_decls.h include/EASTL/internal/type_compound.h include/EASTL/internal/type_detected.h include/EASTL/internal/type_fundamental.h include/EASTL/internal/type_pod.h include/EASTL/internal/type_properties.h include/EASTL/internal/type_transformations.h include/EASTL/internal/type_void_t.h include/EASTL/intrusive_hash_map.h include/EASTL/intrusive_hash_set.h include/EASTL/intrusive_list.h include/EASTL/intrusive_ptr.h include/EASTL/iterator.h include/EASTL/linked_array.h include/EASTL/linked_ptr.h include/EASTL/list.h include/EASTL/map.h include/EASTL/memory.h include/EASTL/meta.h include/EASTL/numeric.h include/EASTL/numeric_limits.h include/EASTL/optional.h include/EASTL/priority_queue.h include/EASTL/queue.h include/EASTL/random.h include/EASTL/ratio.h include/EASTL/safe_ptr.h include/EASTL/scoped_array.h include/EASTL/scoped_ptr.h include/EASTL/segmented_vector.h include/EASTL/set.h include/EASTL/shared_array.h include/EASTL/shared_ptr.h include/EASTL/slist.h include/EASTL/sort.h include/EASTL/span.h include/EASTL/stack.h include/EASTL/string.h include/EASTL/string_hash_map.h include/EASTL/string_map.h include/EASTL/string_view.h include/EASTL/tuple.h include/EASTL/type_traits.h include/EASTL/unique_ptr.h include/EASTL/unordered_map.h include/EASTL/unordered_set.h include/EASTL/utility.h include/EASTL/variant.h include/EASTL/vector.h include/EASTL/vector_map.h include/EASTL/vector_multimap.h include/EASTL/vector_multiset.h include/EASTL/vector_set.h include/EASTL/version.h include/EASTL/weak_ptr.h lib/libEASTL.so