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-24 14:27:50 +0100 |
| commit | 2ce419056722030ac1e7b8800893a62e085bd024 (patch) | |
| tree | 479db09ecfad719cd0220310f63c83908c8d2652 /meta | |
| parent | 763c76c437ff72d452b1670301476d4123a98a14 (diff) | |
| download | openembedded-core-2ce419056722030ac1e7b8800893a62e085bd024.tar.gz | |
binutils: Remove conflict markers from 0008-Use-libtool-2.4.patch
The diff hunks were not doing anything important, just remove them.
Signed-off-by: Ola x Nilsson <olani@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 # 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. */ |