git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 4a891e1eddbf63f32fe769b5bff289f6748abf45 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 [http://ffmpeg.org/pipermail/ffmpeg-devel/2022-January/291781.html]
  10 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  11
  12 ---
  13  libavutil/x86/cpuid.asm      | 2 +-
  14  libavutil/x86/emms.asm       | 2 +-
  15  libavutil/x86/fixed_dsp.asm  | 2 +-
  16  libavutil/x86/float_dsp.asm  | 2 +-
  17  libavutil/x86/lls.asm        | 2 +-
  18  libavutil/x86/pixelutils.asm | 2 +-
  19  libavutil/x86/tx_float.asm   | 2 +-
  20  7 files changed, 7 insertions(+), 7 deletions(-)
  21
  22 diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
  23 index c3f7866..766f77f 100644
  24 --- a/libavutil/x86/cpuid.asm
  25 +++ b/libavutil/x86/cpuid.asm
  26 @@ -21,7 +21,7 @@
  27  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  28  ;******************************************************************************
  29
  30 -%include "x86util.asm"
  31 +%include "libavutil/x86/x86util.asm"
  32
  33  SECTION .text
  34
  35 diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
  36 index 8611762..df84f22 100644
  37 --- a/libavutil/x86/emms.asm
  38 +++ b/libavutil/x86/emms.asm
  39 @@ -18,7 +18,7 @@
  40  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  41  ;******************************************************************************
  42
  43 -%include "x86util.asm"
  44 +%include "libavutil/x86/x86util.asm"
  45
  46  SECTION .text
  47
  48 diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
  49 index 979dd5c..2f41185 100644
  50 --- a/libavutil/x86/fixed_dsp.asm
  51 +++ b/libavutil/x86/fixed_dsp.asm
  52 @@ -20,7 +20,7 @@
  53  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  54  ;******************************************************************************
  55
  56 -%include "x86util.asm"
  57 +%include "libavutil/x86/x86util.asm"
  58
  59  SECTION .text
  60
  61 diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
  62 index 517fd63..b773e61 100644
  63 --- a/libavutil/x86/float_dsp.asm
  64 +++ b/libavutil/x86/float_dsp.asm
  65 @@ -20,7 +20,7 @@
  66  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  67  ;******************************************************************************
  68
  69 -%include "x86util.asm"
  70 +%include "libavutil/x86/x86util.asm"
  71
  72  SECTION_RODATA 32
  73  pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
  74 diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
  75 index 317fba6..d2526d1 100644
  76 --- a/libavutil/x86/lls.asm
  77 +++ b/libavutil/x86/lls.asm
  78 @@ -20,7 +20,7 @@
  79  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  80  ;******************************************************************************
  81
  82 -%include "x86util.asm"
  83 +%include "libavutil/x86/x86util.asm"
  84
  85  SECTION .text
  86
  87 diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
  88 index 36c57c5..8b45ead 100644
  89 --- a/libavutil/x86/pixelutils.asm
  90 +++ b/libavutil/x86/pixelutils.asm
  91 @@ -21,7 +21,7 @@
  92  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  93  ;******************************************************************************
  94
  95 -%include "x86util.asm"
  96 +%include "libavutil/x86/x86util.asm"
  97
  98  SECTION .text
  99
 100 diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm
 101 index 4d2283f..ea39f21 100644
 102 --- a/libavutil/x86/tx_float.asm
 103 +++ b/libavutil/x86/tx_float.asm
 104 @@ -29,7 +29,7 @@
 105  ;       replace some shuffles with vblends?
 106  ;       avx512 split-radix
 107
 108 -%include "x86util.asm"
 109 +%include "libavutil/x86/x86util.asm"
 110
 111  %if ARCH_X86_64
 112  %define ptr resq