Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ff8fda63398ab1755ddeabdb1d820dfa8299216)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ff8fda63398ab1755ddeabdb1d820dfa8299216)
  • Date: Sat, 3 Jun 2023 15:35:11 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/mold/DEPENDS | 6
devel/mold/DETAILS | 4
devel/mold/HISTORY | 5
libs/tbb/DETAILS | 4
libs/tbb/HISTORY | 4
libs/tbb/patches/0001-Retry-if-pthread_create-fails-with-EAGAIN.patch | 64
----------
libs/tbb/patches/0002-Enable-building-against-libucontext.patch | 57
--------
7 files changed, 16 insertions(+), 128 deletions(-)

New commits:
commit 8ff8fda63398ab1755ddeabdb1d820dfa8299216
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mold - adjust depends

commit a6aeccb5608ac3ac44141610011a85437c53fef7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tbb: => 2021.9.0

commit 136cfd8a493b1c5e2f1c3d6797a6dd36567e7fce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mold: => 1.11.0

diff --git a/devel/mold/DEPENDS b/devel/mold/DEPENDS
index 7afd4cc..1f46739 100755
--- a/devel/mold/DEPENDS
+++ b/devel/mold/DEPENDS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}"/CMAKE_DEPENDS &&

-depends llvm &&
-depends tbb "-DMOLD_ENABLE_SYSTEM_TBB=true" &&
+depends tbb " -DMOLD_USE_SYSTEM_TBB=ON" &&
depends SSL &&
-depends zlib
+depends zlib &&
+depends zstd
diff --git a/devel/mold/DETAILS b/devel/mold/DETAILS
index 18d3071..21e2ee8 100755
--- a/devel/mold/DETAILS
+++ b/devel/mold/DETAILS
@@ -1,9 +1,9 @@
. "${GRIMOIRE}"/CMAKE_FUNCTIONS
SPELL=mold
- VERSION=1.8.0
+ VERSION=1.11.0
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/rui314/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
+
SOURCE_HASH=sha512:a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/rui314/mold";
LICENSE[0]=AGPL
diff --git a/devel/mold/HISTORY b/devel/mold/HISTORY
index e3ba1f0..850c1de 100644
--- a/devel/mold/HISTORY
+++ b/devel/mold/HISTORY
@@ -1,3 +1,8 @@
+2023-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11.0
+ * DEPENDS: use zstd, fix tbb flags
+ does not need llvm, builds fine with gcc-13
+
2023-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.0

diff --git a/libs/tbb/DETAILS b/libs/tbb/DETAILS
index 4b65ecf..c45af7a 100755
--- a/libs/tbb/DETAILS
+++ b/libs/tbb/DETAILS
@@ -1,7 +1,7 @@
source "$GRIMOIRE/CMAKE_FUNCTIONS"
SPELL=tbb
- VERSION=2021.8.0
-
SOURCE_HASH=sha512:72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4
+ VERSION=2021.9.0
+
SOURCE_HASH=sha512:2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/oneTBB-${VERSION}
WEB_SITE=https://www.threadingbuildingblocks.org
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 2862110..020259a 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,7 @@
+2023-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2021.9.0
+ * patches/: delele obsolete patcches
+
2022-12-23 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2021.8.0

diff --git
a/libs/tbb/patches/0001-Retry-if-pthread_create-fails-with-EAGAIN.patch
b/libs/tbb/patches/0001-Retry-if-pthread_create-fails-with-EAGAIN.patch
deleted file mode 100644
index 95e7873..0000000
--- a/libs/tbb/patches/0001-Retry-if-pthread_create-fails-with-EAGAIN.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f12c93efd04991bc982a27e2fa6142538c33ca82 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama <ruiu AT cs.stanford.edu>
-Date: Sat, 7 May 2022 19:55:24 +0800
-Subject: [PATCH] Retry if pthread_create fails with EAGAIN
-
-On many Unix-like systems, pthread_create can fail spuriously even if
-the running machine has enough resources to spawn a new thread.
-Therefore, if EAGAIN is returned from pthread_create, we actually have
-to try again.
-
-I observed this issue when running the mold linker
-(https://github.com/rui314/mold) under a heavy load. mold uses OneTBB
-for parallelization.
-
-As another data point, Go has the same logic to retry on EAGAIN:
-https://go-review.googlesource.com/c/go/+/33894/
-
-nanosleep is defined in POSIX 2001, so I believe that all Unix-like
-systems support it.
-
-Signed-off-by: Rui Ueyama <ruiu AT cs.stanford.edu>
-Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/824]
----
- src/tbb/rml_thread_monitor.h | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tbb/rml_thread_monitor.h b/src/tbb/rml_thread_monitor.h
-index 13b556380..5b844b232 100644
---- a/src/tbb/rml_thread_monitor.h
-+++ b/src/tbb/rml_thread_monitor.h
-@@ -31,6 +31,7 @@
- #include <pthread.h>
- #include <cstring>
- #include <cstdlib>
-+#include <time.h>
- #else
- #error Unsupported platform
- #endif
-@@ -191,8 +192,24 @@ inline thread_monitor::handle_type
thread_monitor::launch( void* (*thread_routin
- check(pthread_attr_init( &s ), "pthread_attr_init has failed");
- if( stack_size>0 )
- check(pthread_attr_setstacksize( &s, stack_size ),
"pthread_attr_setstack_size has failed" );
-+
- pthread_t handle;
-- check( pthread_create( &handle, &s, thread_routine, arg ),
"pthread_create has failed" );
-+ int tries = 0;
-+ for (;;) {
-+ int error_code = pthread_create(&handle, &s, thread_routine, arg);
-+ if (!error_code)
-+ break;
-+ if (error_code != EAGAIN || tries++ > 20) {
-+ handle_perror(error_code, "pthread_create has failed");
-+ break;
-+ }
-+
-+ // pthreaed_create can spuriously fail on many Unix-like systems.
-+ // Retry after tries * 1 millisecond.
-+ struct timespec ts = {0, tries * 1000 * 1000};
-+ nanosleep(&ts, NULL);
-+ }
-+
- check( pthread_attr_destroy( &s ), "pthread_attr_destroy has failed" );
- return handle;
- }
diff --git a/libs/tbb/patches/0002-Enable-building-against-libucontext.patch
b/libs/tbb/patches/0002-Enable-building-against-libucontext.patch
deleted file mode 100644
index 40fb478..0000000
--- a/libs/tbb/patches/0002-Enable-building-against-libucontext.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f5872f3f9726a2f91c0189735c0dbcf7b029337f Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Fri, 9 Sep 2022 16:56:49 +0200
-Subject: [PATCH 2/2] Enable building against libucontext
-
-The ucontext.h API may be implemented outside the libc.
-
-Origin: Source Mage GNU/Linux
-Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/900]
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- cmake/ucontext.cmake | 20 ++++++++++++++++++++
- src/tbb/CMakeLists.txt | 1 +
- 2 files changed, 21 insertions(+)
- create mode 100644 cmake/ucontext.cmake
-
-diff --git a/cmake/ucontext.cmake b/cmake/ucontext.cmake
-new file mode 100644
-index 000000000000..26f22559c78f
---- /dev/null
-+++ b/cmake/ucontext.cmake
-@@ -0,0 +1,20 @@
-+# The ucontext API may be implemented outside the default library set
-+include(CheckSymbolExists)
-+if (NOT DEFINED UCONTEXT_LIBRARIES
-+ AND CMAKE_SYSTEM_NAME MATCHES "^Linux")
-+ check_symbol_exists("getcontext" "ucontext.h" HAVE_UCONTEXT)
-+ if (NOT HAVE_UCONTEXT)
-+ message(STATUS "Checking for libucontext")
-+ find_library(LIBUCONTEXT "ucontext")
-+ if (LIBUCONTEXT STREQUAL "LIBUCONTEXT-NOTFOUND")
-+ message(WARNING "No ucontext API available")
-+ set(LIBUCONTEXT "")
-+ else()
-+ message(STATUS "Found libucontext: ${LIBUCONTEXT}")
-+ set(HAVE_UCONTEXT 1)
-+ endif()
-+ set(UCONTEXT_LIBRARIES "${LIBUCONTEXT}" CACHE FILEPATH
-+ "Library providing the ucontext API (if not in the default set)")
-+ endif()
-+endif()
-+mark_as_advanced(LIBUCONTEXT HAVE_UCONTEXT)
-diff --git a/src/tbb/CMakeLists.txt b/src/tbb/CMakeLists.txt
-index 7f8228c09d11..c24db1f34bd2 100644
---- a/src/tbb/CMakeLists.txt
-+++ b/src/tbb/CMakeLists.txt
-@@ -118,6 +118,7 @@ target_link_libraries(tbb
- Threads::Threads
- ${TBB_LIB_LINK_LIBS}
- ${TBB_COMMON_LINK_LIBS}
-+ ${UCONTEXT_LIBRARIES}
- )
-
- tbb_install_target(tbb)
---
-2.37.3
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ff8fda63398ab1755ddeabdb1d820dfa8299216), Treeve Jelbert, 06/03/2023

Archive powered by MHonArc 2.6.24.

Top of Page