1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

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>
This commit is contained in:
Ola x Nilsson
2024-04-24 13:26:10 +02:00
committed by Richard Purdie
parent 368dd0432e
commit 25adb31d37
@@ -19543,18 +19543,6 @@ index 3701bd8e796..9e36ae7c51c 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -13596,7 +14245,11 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
+<<<<<<< HEAD
#line 13599 "configure"
+=======
+#line $LINENO "configure"
+>>>>>>> b932158cf4c (Use libtool 2.4)
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13640,10 +14293,10 @@ else
/* When -fvisbility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
@@ -19568,18 +19556,6 @@ index 3701bd8e796..9e36ae7c51c 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -13702,7 +14355,11 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
+<<<<<<< HEAD
#line 13705 "configure"
+=======
+#line $LINENO "configure"
+>>>>>>> b932158cf4c (Use libtool 2.4)
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13746,10 +14403,10 @@ else
/* When -fvisbility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */