Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 3d9199423d48766649a2b2ebb3924e892ed16fa4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 3 | Date: Tue, 20 Jun 2017 15:32:08 -0400 |
| 4 | Subject: [PATCH] openssl: Force soft link to avoid rare race |
| 5 | |
| 6 | This patch works around a rare parallel build race condition. |
| 7 | The error seen is: |
| 8 | |
| 9 | ln: failed to create symbolic link 'libssl.so': File exists |
| 10 | make[4]: *** [Makefile.shared:171: link_a.gnu] Error 1 |
| 11 | make[4]: Leaving directory |
| 12 | '/.../build/tmp-glibc/work/x86_64-linux/openssl-native/1.0.2k-r0/openssl-1.0.2k' |
| 13 | |
| 14 | The openssl team is rewriting their build files so it's not |
| 15 | appropriate for openssl upstream and fixing the root cause of |
| 16 | the Makefile race condition was also not pursued. |
| 17 | |
| 18 | Upstream-Status: Inappropriate [build rules rewrite in progress] |
| 19 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
| 20 | --- |
| 21 | Makefile.shared | 4 ++-- |
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 23 | |
| 24 | diff --git a/Makefile.shared b/Makefile.shared |
| 25 | index e8d222a..1bff92f 100644 |
| 26 | --- a/Makefile.shared |
| 27 | +++ b/Makefile.shared |
| 28 | @@ -118,14 +118,14 @@ |
| 29 | if [ -n "$$SHLIB_COMPAT" ]; then \ |
| 30 | for x in $$SHLIB_COMPAT; do \ |
| 31 | ( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \ |
| 32 | - ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \ |
| 33 | + ln -sf $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \ |
| 34 | prev=$$SHLIB$$x$$SHLIB_SUFFIX; \ |
| 35 | done; \ |
| 36 | fi; \ |
| 37 | if [ -n "$$SHLIB_SOVER" ]; then \ |
| 38 | [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ |
| 39 | ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ |
| 40 | - ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ |
| 41 | + ln -sf $$prev $$SHLIB$$SHLIB_SUFFIX ); \ |
| 42 | fi; \ |
| 43 | fi |
| 44 | |
| 45 | -- |
| 46 | 2.9.3 |