ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/mpg123/0001-fix-x86-build.patch

   1 diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h
   2 index e37386a..b474e7f 100644
   3 --- a/src/libmpg123/mangle.h
   4 +++ b/src/libmpg123/mangle.h
   5 @@ -85,6 +85,10 @@
   6  #define ASM_VALUE(a) MANGLE_MACROCAT($,a)
   7  #endif
   8
   9 +#if defined(_WIN32) && !defined(_WIN64)
  10 +#define OPT_X86
  11 +#endif
  12 +
  13  /* Enable position-independent code for certain platforms. */
  14
  15  #if defined(OPT_X86)
  16 @@ -130,7 +134,7 @@ Lpic_base: \
  17  /* Dummies for everyone else. */
  18  #define LOCAL_VAR(a) a
  19  #define GLOBAL_VAR ASM_NAME
  20 -#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object.
  21 +#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object.
  22  #define FUNC ASM_NAME
  23  #define EXTERNAL_FUNC ASM_NAME
  24  #define GET_GOT
  25 diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
  26 index f2bc362..07e81cd 100644
  27 --- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
  28 +++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
  29 @@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_
  30  </Command>
  31      </PreLinkEvent>
  32      <Lib>
  33 -      <AdditionalDependencies>Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies)</AdditionalDependencies>
  34 +      <AdditionalDependencies>Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies)</AdditionalDependencies>
  35        <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  36        <Verbose>true</Verbose>
  37      </Lib>