Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (456c8e36951ba329f1c014652a9c3c6f8add06bc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (456c8e36951ba329f1c014652a9c3c6f8add06bc)
  • Date: Tue, 7 Mar 2023 00:53:00 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

dev/null |binary
devel/nlohmann_json/BUILD | 3
devel/nlohmann_json/CONFIGURE | 1
devel/nlohmann_json/DEPENDS | 1
devel/nlohmann_json/DETAILS | 18 +-
devel/nlohmann_json/HISTORY | 10 +
devel/nlohmann_json/INSTALL | 15 --
devel/nlohmann_json/PRE_BUILD | 5
devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch | 76
+++++++++++
9 files changed, 100 insertions(+), 29 deletions(-)

New commits:
commit 456c8e36951ba329f1c014652a9c3c6f8add06bc
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

nlohmann_json: => 3.11.2, convert to cmake build

diff --git a/devel/nlohmann_json/BUILD b/devel/nlohmann_json/BUILD
index 397db75..913966c 100755
--- a/devel/nlohmann_json/BUILD
+++ b/devel/nlohmann_json/BUILD
@@ -1 +1,2 @@
-:
+OPTS="-DJSON_BuildTests=no $OPTS" &&
+default_build
diff --git a/devel/nlohmann_json/CONFIGURE b/devel/nlohmann_json/CONFIGURE
new file mode 100755
index 0000000..90942b1
--- /dev/null
+++ b/devel/nlohmann_json/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/devel/nlohmann_json/DEPENDS b/devel/nlohmann_json/DEPENDS
new file mode 100755
index 0000000..31f7a58
--- /dev/null
+++ b/devel/nlohmann_json/DEPENDS
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_DEPENDS"
diff --git a/devel/nlohmann_json/DETAILS b/devel/nlohmann_json/DETAILS
index 574be9b..e28b175 100755
--- a/devel/nlohmann_json/DETAILS
+++ b/devel/nlohmann_json/DETAILS
@@ -1,14 +1,12 @@
-#source $GRIMOIRE/CMAKE_FUNCTIONS
+source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=nlohmann_json
- VERSION=3.9.1
- SOURCE=$SPELL-$VERSION
- SOURCE2=$SOURCE.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=https://github.com/nlohmann/json
- SOURCE_URL[0]=$WEB_SITE/releases/download/v$VERSION/json.hpp
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=nlohman.gpg:$SOURCE.asc:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ SPELLX=json
+ VERSION=3.11.2
+ SOURCE=$SPELLX-$VERSION.tar.xz
+
SOURCE_HASH=sha256:d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=https://github.com/nlohmann/json
+ SOURCE_URL[0]=$WEB_SITE/archive/v${VERSION}.tar.gz
LICENSE[0]=MIT
ENTERED=20180627
KEYWORDS=""
diff --git a/devel/nlohmann_json/HISTORY b/devel/nlohmann_json/HISTORY
index 3b1bd6b..da0a0e1 100644
--- a/devel/nlohmann_json/HISTORY
+++ b/devel/nlohmann_json/HISTORY
@@ -1,3 +1,12 @@
+2023-03-06 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: version 3.11.2, convert to cmake build
+ switch source verification to hash
+ * DEPENDS: added, CMAKE_DEPENDS
+ * CONFIGURE: added, CMAKE_CONFIGURE
+ * BUILD: turn tests off, cmake build
+ * patches/*-gcc13.patch: added, patch bug related to gcc13
+ * INSTALL, nlohman.gpg: deleted
+
2020-11-21 Ismael Luceno <ismael AT sourcemage.org>
* INSTALL: Fixed typo

@@ -21,4 +30,3 @@
2018-06-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.1.2
spell created
-
diff --git a/devel/nlohmann_json/INSTALL b/devel/nlohmann_json/INSTALL
deleted file mode 100755
index 9880c73..0000000
--- a/devel/nlohmann_json/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-dest="$INSTALL_ROOT"/usr &&
-incdir="$dest"/include/nlhomann &&
-pkgconfigdir="$dest"/lib/pkgconfig &&
-
-install -d "$pkgconfigdir" "$incdir" &&
-
-install -m 444 "$SOURCE_CACHE/$SOURCE" "$incdir"/json.hpp &&
-
-pcfile="$pkgconfigdir"/nlohmann_json.pc &&
-cat > "$pcfile" <<! &&
-Name: $SPELL
-Version: $VERSION
-Cflags: -I"$dest"
-!
-chmod 444 "$pcfile"
diff --git a/devel/nlohmann_json/PRE_BUILD b/devel/nlohmann_json/PRE_BUILD
index 1a982e0..0cab101 100755
--- a/devel/nlohmann_json/PRE_BUILD
+++ b/devel/nlohmann_json/PRE_BUILD
@@ -1,2 +1,3 @@
-# only needed for verifying the signature
-unpack_file
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches
diff --git a/devel/nlohmann_json/nlohman.gpg b/devel/nlohmann_json/nlohman.gpg
deleted file mode 100644
index ac93998..0000000
Binary files a/devel/nlohmann_json/nlohman.gpg and /dev/null differ
diff --git a/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
b/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
new file mode 100644
index 0000000..5205e67
--- /dev/null
+++ b/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
@@ -0,0 +1,76 @@
+https://github.com/nlohmann/json/issues/3927
+https://github.com/nlohmann/json/pull/3895
+
+From a5b09d50b786638ed9deb09ef13860a3cb64eb6b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich AT gmail.com>
+Date: Tue, 20 Dec 2022 22:08:12 +0000
+Subject: [PATCH] custom allocators: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+ In file included from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
+ from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39,
+ from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/string:54,
+ from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40,
+ from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/locale:41,
+ from tests/src/unit-regression2.cpp:19:
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In
instantiation of 'struct
std::__allocator_traits_base::__rebind<my_allocator<unsigned char>, unsigned
char, void>':
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:
required by substitution of 'template<class _Alloc, class _Up> using
std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc,
_Up>::type [with _Alloc = my_allocator<unsigned char>; _Up = unsigned char]'
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:
required by substitution of 'template<class _Alloc> template<class _Tp> using
std::allocator_traits< <template-parameter-1-1> >::rebind_alloc =
std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc =
my_allocator<unsigned char>]'
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:
required from 'struct __gnu_cxx::__alloc_traits<my_allocator<unsigned char>,
unsigned char>::rebind<unsigned char>'
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:
required from 'struct std::_Vector_base<unsigned char, my_allocator<unsigned
char> >'
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:
required from 'class std::vector<unsigned char, my_allocator<unsigned char> >'
+ tests/src/unit-regression2.cpp:807:63: required from here
+ <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error:
static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type>
must be A
+ 70 | _Tp>::value,
+ | ^~~~~
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+--- a/tests/src/unit-allocator.cpp
++++ b/tests/src/unit-allocator.cpp
+@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T>
+ {
+ using std::allocator<T>::allocator;
+
++ bad_allocator() = default;
++ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { }
++
+ template<class... Args>
+ void construct(T* /*unused*/, Args&& ... /*unused*/)
+ {
+ throw std::bad_alloc();
+ }
++
++ template <class U>
++ struct rebind
++ {
++ using other = bad_allocator<U>;
++ };
+ };
+ } // namespace
+
+--- a/tests/src/unit-regression2.cpp
++++ b/tests/src/unit-regression2.cpp
+@@ -187,6 +187,15 @@ class my_allocator : public std::allocator<T>
+ {
+ public:
+ using std::allocator<T>::allocator;
++
++ my_allocator() = default;
++ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { }
++
++ template <class U>
++ struct rebind
++ {
++ using other = my_allocator<U>;
++ };
+ };
+
+ /////////////////////////////////////////////////////////////////////
+



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (456c8e36951ba329f1c014652a9c3c6f8add06bc), Conner Clere, 03/06/2023

Archive powered by MHonArc 2.6.24.

Top of Page