Attachment 219660 Details for Bug 251106 – Patch from upstream

[patch] Patch from upstream

botan2.patch (text/plain), 2.15 KB, created by Dmitry Marakasov on 2020-11-14 00:46:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2020-11-14 00:46:08 UTC

Size: 2.15 KB

patch

obsolete

>Index: files/patch-fix-link-paths
>===================================================================
>--- files/patch-fix-link-paths	(nonexistent)
>+++ files/patch-fix-link-paths	(working copy)
>@@ -0,0 +1,41 @@
>+From 639a5c4515a36bcbadb82145d755005620c535c3 Mon Sep 17 00:00:00 2001
>+From: Jack Lloyd <jack@randombit.net>
>+Date: Fri, 13 Nov 2020 18:04:09 -0500
>+Subject: [PATCH] Fix use of -L flag when combined with --external-libdir
>+
>+GH #2496
>+---
>+ configure.py               | 6 +++---
>+ src/build-data/makefile.in | 2 +-
>+ 2 files changed, 4 insertions(+), 4 deletions(-)
>+
>+diff --git a/configure.py b/configure.py
>+index 88eeaa5757..0808a03581 100755
>+--- configure.py
>++++ configure.py
>+@@ -2137,9 +2137,9 @@ def choose_cxx_exe():
>+ 
>+         'visibility_attribute': cc.gen_visibility_attribute(options),
>+ 
>+-        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
>+-        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options) + ' ' + external_link_cmd(),
>+-        'post_link_cmd': '',
>++        'lib_link_cmd': cc.so_link_command_for(osinfo.basename, options),
>++        'exe_link_cmd': cc.binary_link_command_for(osinfo.basename, options),
>++        'external_link_cmd': external_link_cmd(),
>+ 
>+         'ar_command': ar_command(),
>+         'ar_options': options.ar_options or cc.ar_options or osinfo.ar_options,
>+diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
>+index 4d68ab1ec7..7a15979b6e 100644
>+--- src/build-data/makefile.in
>++++ src/build-data/makefile.in
>+@@ -20,7 +20,7 @@ LDFLAGS        = %{ldflags}
>+ 
>+ EXE_LINK_CMD   = %{exe_link_cmd}
>+ 
>+-LIB_LINKS_TO   = %{link_to}
>++LIB_LINKS_TO   = %{external_link_cmd} %{link_to}
>+ EXE_LINKS_TO   = %{link_to_botan} $(LIB_LINKS_TO)
>+ 
>+ BUILD_FLAGS    = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
>
>Property changes on: files/patch-fix-link-paths
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 251106: 219640 | 219643 | 219660 | 219690