diff options
author | Ola x Nilsson <olani@axis.com> | 2024-04-24 13:26:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-25 10:06:03 +0100 |
commit | 25adb31d372f9c90618907ae8925fc34655db150 (patch) | |
tree | 5f596eb20576d7fec02ce908fa341ff6b3763f35 | |
parent | 368dd0432e269cf08042d5c5dd46b09180fafded (diff) | |
download | poky-25adb31d372f9c90618907ae8925fc34655db150.tar.gz |
binutils: Remove conflict markers from 0008-Use-libtool-2.4.patch
The diff hunks were not doing anything important, just remove them.
(From OE-Core rev: 06003911df37d41b6d04946571a9c1fbe41a6414)
Signed-off-by: Ola x Nilsson <olani@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 8f74c639d5..05f1ed0dc5 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch | |||
@@ -19543,18 +19543,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19543 | # FIXME: first we should search . and the directory the executable is in | 19543 | # FIXME: first we should search . and the directory the executable is in |
19544 | shlibpath_var=PATH | 19544 | shlibpath_var=PATH |
19545 | ;; | 19545 | ;; |
19546 | @@ -13596,7 +14245,11 @@ else | ||
19547 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19548 | lt_status=$lt_dlunknown | ||
19549 | cat > conftest.$ac_ext <<_LT_EOF | ||
19550 | +<<<<<<< HEAD | ||
19551 | #line 13599 "configure" | ||
19552 | +======= | ||
19553 | +#line $LINENO "configure" | ||
19554 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19555 | #include "confdefs.h" | ||
19556 | |||
19557 | #if HAVE_DLFCN_H | ||
19558 | @@ -13640,10 +14293,10 @@ else | 19546 | @@ -13640,10 +14293,10 @@ else |
19559 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19547 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19560 | correspondingly for the symbols needed. */ | 19548 | correspondingly for the symbols needed. */ |
@@ -19568,18 +19556,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19568 | int main () | 19556 | int main () |
19569 | { | 19557 | { |
19570 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 19558 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19571 | @@ -13702,7 +14355,11 @@ else | ||
19572 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19573 | lt_status=$lt_dlunknown | ||
19574 | cat > conftest.$ac_ext <<_LT_EOF | ||
19575 | +<<<<<<< HEAD | ||
19576 | #line 13705 "configure" | ||
19577 | +======= | ||
19578 | +#line $LINENO "configure" | ||
19579 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19580 | #include "confdefs.h" | ||
19581 | |||
19582 | #if HAVE_DLFCN_H | ||
19583 | @@ -13746,10 +14403,10 @@ else | 19559 | @@ -13746,10 +14403,10 @@ else |
19584 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19560 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19585 | correspondingly for the symbols needed. */ | 19561 | correspondingly for the symbols needed. */ |