diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-07 13:06:42 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-07 13:06:42 +0000 |
commit | 1b97f0352e38f8346984329b82a8be71632220a6 (patch) | |
tree | a2eedd48c9161522b87c70d55cbb7d28d2cb36a9 /dev-build/b2/files/b2-4.9.2-odr.patch | |
parent | a03bc69159ecc073f051ca2079848553a8e34664 (diff) |
gentoo auto-resync : 07:03:2024 - 13:06:41
Diffstat (limited to 'dev-build/b2/files/b2-4.9.2-odr.patch')
-rw-r--r-- | dev-build/b2/files/b2-4.9.2-odr.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/dev-build/b2/files/b2-4.9.2-odr.patch b/dev-build/b2/files/b2-4.9.2-odr.patch deleted file mode 100644 index 62cbca189640..000000000000 --- a/dev-build/b2/files/b2-4.9.2-odr.patch +++ /dev/null @@ -1,54 +0,0 @@ -Avoid ODR violations by giving "_stack" internal linkage -https://bugs.gentoo.org/858320 - ---- a/engine/function.cpp -+++ b/engine/function.cpp -@@ -213,11 +213,11 @@ - } JAM_FUNCTION; - - -+namespace -+{ - typedef struct _stack STACK; - typedef STACK* stack_ptr; - --namespace --{ - template <typename T> - using remove_cref_t - = typename std::remove_const< -@@ -260,7 +260,6 @@ - typename select_last_impl<(sizeof...(A) == 1), type_list<A...> > - ::template type<A...>; - #endif --} - - struct _stack - { -@@ -439,6 +438,8 @@ - cleanups_size += n; - } - -+} -+ - static STACK * stack_global() - { - static _stack singleton; ---- a/engine/make1.cpp -+++ b/engine/make1.cpp -@@ -86,6 +86,7 @@ - #define T_STATE_MAKE1B 1 /* make1b() should be called */ - #define T_STATE_MAKE1C 2 /* make1c() should be called */ - -+namespace { - typedef struct _state state; - struct _state - { -@@ -94,6 +95,7 @@ - TARGET * parent; /* parent argument necessary for MAKE1A */ - int32_t curstate; /* current state */ - }; -+} - - static void make1a( state * const ); - static void make1b( state * const ); |