code.ossystems Code Review - openembedded-core.git/blob

   1 From 24a58d70cbb3997e471366bd5afe54be9007bfb1 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Tue, 10 Nov 2020 15:32:14 +0000
   4 Subject: [PATCH] libavutil: include assembly with full path from source root
   5
   6 Otherwise nasm writes the full host-specific paths into .o
   7 output, which breaks binary reproducibility.
   8
   9 Upstream-Status: Submitted [by email to jamrial@gmail.com,ffmpeg-devel@ffmpeg.org]
  10 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  11 ---
  12  libavutil/x86/cpuid.asm      | 2 +-
  13  libavutil/x86/emms.asm       | 2 +-
  14  libavutil/x86/fixed_dsp.asm  | 2 +-
  15  libavutil/x86/float_dsp.asm  | 2 +-
  16  libavutil/x86/lls.asm        | 2 +-
  17  libavutil/x86/pixelutils.asm | 2 +-
  18  6 files changed, 6 insertions(+), 6 deletions(-)
  19
  20 diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
  21 index c3f7866..766f77f 100644
  22 --- a/libavutil/x86/cpuid.asm
  23 +++ b/libavutil/x86/cpuid.asm
  24 @@ -21,7 +21,7 @@
  25  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  26  ;******************************************************************************
  27
  28 -%include "x86util.asm"
  29 +%include "libavutil/x86/x86util.asm"
  30
  31  SECTION .text
  32
  33 diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
  34 index 8611762..df84f22 100644
  35 --- a/libavutil/x86/emms.asm
  36 +++ b/libavutil/x86/emms.asm
  37 @@ -18,7 +18,7 @@
  38  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  39  ;******************************************************************************
  40
  41 -%include "x86util.asm"
  42 +%include "libavutil/x86/x86util.asm"
  43
  44  SECTION .text
  45
  46 diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
  47 index 979dd5c..2f41185 100644
  48 --- a/libavutil/x86/fixed_dsp.asm
  49 +++ b/libavutil/x86/fixed_dsp.asm
  50 @@ -20,7 +20,7 @@
  51  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  52  ;******************************************************************************
  53
  54 -%include "x86util.asm"
  55 +%include "libavutil/x86/x86util.asm"
  56
  57  SECTION .text
  58
  59 diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
  60 index 517fd63..b773e61 100644
  61 --- a/libavutil/x86/float_dsp.asm
  62 +++ b/libavutil/x86/float_dsp.asm
  63 @@ -20,7 +20,7 @@
  64  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  65  ;******************************************************************************
  66
  67 -%include "x86util.asm"
  68 +%include "libavutil/x86/x86util.asm"
  69
  70  SECTION_RODATA 32
  71  pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
  72 diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
  73 index 317fba6..d2526d1 100644
  74 --- a/libavutil/x86/lls.asm
  75 +++ b/libavutil/x86/lls.asm
  76 @@ -20,7 +20,7 @@
  77  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  78  ;******************************************************************************
  79
  80 -%include "x86util.asm"
  81 +%include "libavutil/x86/x86util.asm"
  82
  83  SECTION .text
  84
  85 diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
  86 index 36c57c5..8b45ead 100644
  87 --- a/libavutil/x86/pixelutils.asm
  88 +++ b/libavutil/x86/pixelutils.asm
  89 @@ -21,7 +21,7 @@
  90  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  91  ;******************************************************************************
  92
  93 -%include "x86util.asm"
  94 +%include "libavutil/x86/x86util.asm"
  95
  96  SECTION .text
  97