update ceph source to reef 18.1.2

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

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/mpg123/0001-fix-x86-build.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/mpg123/0001-fix-x86-build.patch
new file mode 100644 (file)
index 0000000..9c098c6
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/mpg123/0001-fix-x86-build.patch
@@ -0,0 +1,37 @@
+diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h
+index e37386a..b474e7f 100644
+--- a/src/libmpg123/mangle.h
++++ b/src/libmpg123/mangle.h
+@@ -85,6 +85,10 @@
+ #define ASM_VALUE(a) MANGLE_MACROCAT($,a)
+ #endif
+ 
++#if defined(_WIN32) && !defined(_WIN64)
++#define OPT_X86
++#endif
++
+ /* Enable position-independent code for certain platforms. */
+ 
+ #if defined(OPT_X86)
+@@ -130,7 +134,7 @@ Lpic_base: \
+ /* Dummies for everyone else. */
+ #define LOCAL_VAR(a) a
+ #define GLOBAL_VAR ASM_NAME
+-#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object.
++#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object.
+ #define FUNC ASM_NAME
+ #define EXTERNAL_FUNC ASM_NAME
+ #define GET_GOT
+diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
+index f2bc362..07e81cd 100644
+--- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
++++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
+@@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_
+ </Command>
+     </PreLinkEvent>
+     <Lib>
+-      <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>
++      <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>
+       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+       <Verbose>true</Verbose>
+     </Lib>