diff options
| author | Matt Turner <mattst88@gentoo.org> | 2022-08-17 23:15:38 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-08-17 23:16:28 -0400 |
| commit | 475dab847fb2e961d0ef35173cd1295d17bf966b (patch) | |
| tree | 01059f6997b89a2176b9069f7f442640fb60d4b0 /dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch | |
| parent | 3deed26b3259a962305414e179bc34f357f35d0b (diff) | |
| download | gentoo-475dab847fb2e961d0ef35173cd1295d17bf966b.tar.gz gentoo-475dab847fb2e961d0ef35173cd1295d17bf966b.tar.bz2 gentoo-475dab847fb2e961d0ef35173cd1295d17bf966b.zip | |
Revert "dev-cpp/glog: Drop old versions"
Still needed by sci-libs/caffe2.
This reverts commit 3817d0904d1cd868a656cf05c50f431bd6a6ccb7.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch')
| -rw-r--r-- | dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch new file mode 100644 index 000000000000..e53318ac66ff --- /dev/null +++ b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch @@ -0,0 +1,35 @@ +Description: fix FTBFS on x32 +Author: Guillaume Morin <guillaume@morinfr.org> +Forwarded: no +Last-Update: 2019-08-05 + +--- + +--- google-glog-0.3.4.orig/src/symbolize_unittest.cc ++++ google-glog-0.3.4/src/symbolize_unittest.cc +@@ -313,8 +313,12 @@ extern "C" { + inline void* always_inline inline_func() { + void *pc = NULL; + #ifdef TEST_X86_32_AND_64 ++#if __x86_64__ || (__x86_64__ && __ILP32__) ++ __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc)); ++#else + __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); + #endif ++#endif + return pc; + } + +@@ -322,8 +326,12 @@ void* ATTRIBUTE_NOINLINE non_inline_func + void* ATTRIBUTE_NOINLINE non_inline_func() { + void *pc = NULL; + #ifdef TEST_X86_32_AND_64 ++#if __x86_64__ || (__x86_64__ && __ILP32__) ++ __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc)); ++#else + __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); + #endif ++#endif + return pc; + } + |