mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
https://codeberg.org/shelter/reschroot/pulls/5
|
||
https://bugs.gentoo.org/739034
|
||
https://bugs.gentoo.org/715514
|
||
|
||
From 56b0c8ac846c18002e32e93629ae04a0a6281706 Mon Sep 17 00:00:00 2001
|
||
From: Sam James <sam@gentoo.org>
|
||
Date: Mon, 26 Sep 2022 20:52:54 +0100
|
||
Subject: [PATCH 1/3] Fix libcxx build without <tr1/*> (use <memory> if
|
||
available)
|
||
|
||
With Clang & libcxx 15, tr1/* doesn't seem to be available,
|
||
which is fine, as we can use the proper <memory> header
|
||
instead.
|
||
|
||
We already do this in several other locations. Fall back
|
||
to tr1 and Boost as before.
|
||
|
||
Signed-off-by: Sam James <sam@gentoo.org>
|
||
--- a/bin/schroot-base/schroot-base-options.h
|
||
+++ b/bin/schroot-base/schroot-base-options.h
|
||
@@ -27,7 +27,9 @@
|
||
#include <string>
|
||
#include <stdexcept>
|
||
|
||
-#ifdef HAVE_TR1_MEMORY
|
||
+#ifdef HAVE_MEMORY_SHARED_PTR
|
||
+#include <memory>
|
||
+#elif HAVE_TR1_MEMORY
|
||
#include <tr1/memory>
|
||
#elif HAVE_BOOST_SHARED_PTR_HPP
|
||
#include <boost/shared_ptr.hpp>
|
||
--- a/bin/schroot/schroot-options-base.h
|
||
+++ b/bin/schroot/schroot-options-base.h
|
||
@@ -27,7 +27,9 @@
|
||
#include <string>
|
||
#include <vector>
|
||
|
||
-#ifdef HAVE_TR1_MEMORY
|
||
+#ifdef HAVE_MEMORY_SHARED_PTR
|
||
+#include <memory>
|
||
+#elif HAVE_TR1_MEMORY
|
||
#include <tr1/memory>
|
||
#elif HAVE_BOOST_SHARED_PTR_HPP
|
||
#include <boost/shared_ptr.hpp>
|
||
From 5b00d06a567fe71328124ea53b92ddbd1bd8c6fd Mon Sep 17 00:00:00 2001
|
||
From: Sam James <sam@gentoo.org>
|
||
Date: Mon, 26 Sep 2022 20:54:45 +0100
|
||
Subject: [PATCH 3/3] Add <libintl.h> include for musl
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Fixes error:
|
||
```
|
||
/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc: In static member function ‘static std::ostream& sbuild::feature::print_features(std::ostream&)’:
|
||
/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc:48:40: error: ‘gettext’ was not declared in this scope
|
||
48 | stream << feature % pos->first % gettext(pos->second.c_str());
|
||
| ^~~~~~~
|
||
```
|
||
|
||
Bug: https://bugs.gentoo.org/715514
|
||
Signed-off-by: Sam James <sam@gentoo.org>
|
||
--- a/sbuild/sbuild-feature.cc
|
||
+++ b/sbuild/sbuild-feature.cc
|
||
@@ -19,6 +19,7 @@
|
||
#include <config.h>
|
||
|
||
#include <iostream>
|
||
+#include <libintl.h>
|
||
|
||
#include "sbuild-feature.h"
|
||
|