diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-02-15 16:31:31 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-02-15 16:31:31 +0100 |
| commit | ee200ae08a200b9f3373e4a103f58baa070f7786 (patch) | |
| tree | d9416e06ad3b062d4b7059a941600cece4a4912d | |
| parent | cbe040f29c720404b26b8016f31176800fb1a01d (diff) | |
Apply an upstream patch for binutils bfd.h breakage
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream-fixes/0002-trace-handle-binutils-bfd.h-breakage.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 5058973..5d45c72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch allow-tlsv1.patch 2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch +upstream-fixes/0002-trace-handle-binutils-bfd.h-breakage.patch diff --git a/debian/patches/upstream-fixes/0002-trace-handle-binutils-bfd.h-breakage.patch b/debian/patches/upstream-fixes/0002-trace-handle-binutils-bfd.h-breakage.patch new file mode 100644 index 0000000..7621e0c --- /dev/null +++ b/debian/patches/upstream-fixes/0002-trace-handle-binutils-bfd.h-breakage.patch @@ -0,0 +1,41 @@ +From: Johannes Berg <johannes@sipsolutions.net> +To: hostap@lists.infradead.org +Subject: [PATCH] trace: handle binutils bfd.h breakage +Date: Wed, 15 Jan 2020 10:10:03 +0100 +Message-Id: <1579079403-Ieb75a110fccf593e92e6e0d83bf02ba2e0c86d96@changeid> + +From: Johannes Berg <johannes.berg@intel.com> + +Some things in bfd.h that we use were renamed, and in the +case of bfd_get_section_vma() a parameter was dropped. +Work around this. + +Signed-off-by: Johannes Berg <johannes.berg@intel.com> +--- + src/utils/trace.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/utils/trace.c b/src/utils/trace.c +index 40843432050e..8f12da87bb1b 100644 +--- a/src/utils/trace.c ++++ b/src/utils/trace.c +@@ -146,6 +146,17 @@ struct bfd_data { + unsigned int line; + }; + ++/* ++ * binutils removed the bfd parameter and renamed things but ++ * those were macros so we can detect their absence. ++ * Cf. https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=fd3619828e94a24a92cddec42cbc0ab33352eeb4;hp=5dfda3562a69686c43aad4fb0269cc9d5ec010d5 ++ */ ++#ifndef bfd_get_section_vma ++#define bfd_get_section_vma(bfd, section) bfd_section_vma(section) ++#endif ++#ifndef bfd_get_section_size ++#define bfd_get_section_size bfd_section_size ++#endif + + static void find_addr_sect(bfd *abfd, asection *section, void *obj) + { +-- +2.24.1 |