-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-devel/gcc-14.2.1_p20241221: fix compilation with libintl-0.23
Closes: https://bugs.gentoo.org/946500 Signed-off-by: Fabian Groffen <[email protected]>
- Loading branch information
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
libcpp/system.h: remove setlocale override | ||
|
||
This is non-upstreamable as is, it seems the configure check for | ||
HAVE_SETLOCALE is missing, but since it comes from libintl.h not sure | ||
how trivial this is (needs gettext macros). | ||
|
||
In Prefix setlocale is always present, either via the libc, or libintl. | ||
So we don't need to dummy it. Doing so results in problems with | ||
libintl-0.23, which is included right after dummifying. | ||
|
||
Bug: https://bugs.gentoo.org/946500 | ||
|
||
--- a/libcpp/system.h | ||
+++ b/libcpp/system.h | ||
@@ -271,10 +271,6 @@ | ||
# include <langinfo.h> | ||
#endif | ||
|
||
-#ifndef HAVE_SETLOCALE | ||
-# define setlocale(category, locale) (locale) | ||
-#endif | ||
- | ||
#ifdef ENABLE_NLS | ||
#include <libintl.h> | ||
#else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters