ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/nettle/gmp.patch

   1 diff --git a/SMP/config.h b/SMP/config.h
   2 index e4de0f1..ba41eb4 100644
   3 --- a/SMP/config.h
   4 +++ b/SMP/config.h
   5 @@ -102,7 +102,7 @@
   6  #define HAVE_SYS_TYPES_H 1
   7
   8  /* Define to 1 if you have the <unistd.h> header file. */
   9 -#define HAVE_UNISTD_H 1
  10 +//#define HAVE_UNISTD_H 1
  11
  12  /* Define to 1 if you have the <valgrind/memcheck.h> header file. */
  13  /* #undef HAVE_VALGRIND_MEMCHECK_H */
  14 diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
  15 index 476f7a7..308bd0b 100644
  16 --- a/SMP/libhogweed_winrt.vcxproj
  17 +++ b/SMP/libhogweed_winrt.vcxproj
  18 @@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  19      </ClCompile>
  20      <Link>
  21        <ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
  22 -      <AdditionalDependencies>nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  23 +      <AdditionalDependencies>nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  24        <AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
  25      </Link>
  26      <PostBuildEvent>
  27 @@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  28      </ClCompile>
  29      <Link>
  30        <ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
  31 -      <AdditionalDependencies>nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  32 +      <AdditionalDependencies>nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  33        <AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
  34      </Link>
  35      <PostBuildEvent>
  36 @@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  37      </ClCompile>
  38      <Link>
  39        <ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
  40 -      <AdditionalDependencies>nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  41 +      <AdditionalDependencies>nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  42        <AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
  43      </Link>
  44      <PostBuildEvent>
  45 @@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  46      </ClCompile>
  47      <Link>
  48        <ModuleDefinitionFile>libhogweed.def</ModuleDefinitionFile>
  49 -      <AdditionalDependencies>nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
  50 +      <AdditionalDependencies>nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  51        <AdditionalOptions>/IGNORE:4006,4221,4078 %(AdditionalOptions)</AdditionalOptions>
  52      </Link>
  53      <PostBuildEvent>
  54 diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
  55 index 088cb85..cc2cbeb 100644
  56 --- a/SMP/libnettle.vcxproj
  57 +++ b/SMP/libnettle.vcxproj
  58 @@ -18,7 +18,7 @@
  59        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  60      </ClCompile>
  61      <Lib>
  62 -      <AdditionalDependencies>libgmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  63 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  64      </Lib>
  65      <PostBuildEvent>
  66        <Command>mkdir "$(OutDir)"\include
  67 @@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  68        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  69      </ClCompile>
  70      <Lib>
  71 -      <AdditionalDependencies>libgmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
  72 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  73      </Lib>
  74      <PostBuildEvent>
  75        <Command>mkdir "$(OutDir)"\include
  76 @@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  77        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  78      </ClCompile>
  79      <Lib>
  80 -      <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  81 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  82      </Lib>
  83      <PostBuildEvent>
  84        <Command>mkdir "$(OutDir)"\include
  85 @@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  86        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
  87      </ClCompile>
  88      <Lib>
  89 -      <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  90 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  91      </Lib>
  92      <PostBuildEvent>
  93        <Command>mkdir "$(OutDir)"\include
  94 @@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
  95      </ClCompile>
  96      <Link>
  97        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
  98 -      <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
  99 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 100      </Link>
 101      <PostBuildEvent>
 102        <Command>mkdir "$(OutDir)"\include
 103 @@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 104      </ClCompile>
 105      <Link>
 106        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 107 -      <AdditionalDependencies>libgmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 108 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 109      </Link>
 110      <PostBuildEvent>
 111        <Command>mkdir "$(OutDir)"\include
 112 diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj
 113 index cb650ab..188f67a 100644
 114 --- a/SMP/libnettle_winrt.vcxproj
 115 +++ b/SMP/libnettle_winrt.vcxproj
 116 @@ -18,7 +18,7 @@
 117        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 118      </ClCompile>
 119      <Lib>
 120 -      <AdditionalDependencies>libgmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 121 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 122      </Lib>
 123      <PostBuildEvent>
 124        <Command>mkdir "$(OutDir)"\include
 125 @@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 126        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 127      </ClCompile>
 128      <Lib>
 129 -      <AdditionalDependencies>libgmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 130 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 131      </Lib>
 132      <PostBuildEvent>
 133        <Command>mkdir "$(OutDir)"\include
 134 @@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 135      </ClCompile>
 136      <Link>
 137        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 138 -      <AdditionalDependencies>gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 139 +      <AdditionalDependencies>gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 140      </Link>
 141      <PostBuildEvent>
 142        <Command>mkdir "$(OutDir)"\include
 143 @@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 144      </ClCompile>
 145      <Link>
 146        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 147 -      <AdditionalDependencies>gmpd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 148 +      <AdditionalDependencies>gmpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 149      </Link>
 150      <PostBuildEvent>
 151        <Command>mkdir "$(OutDir)"\include
 152 @@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 153        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 154      </ClCompile>
 155      <Lib>
 156 -      <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 157 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 158      </Lib>
 159      <PostBuildEvent>
 160        <Command>mkdir "$(OutDir)"\include
 161 @@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 162        <DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 163      </ClCompile>
 164      <Lib>
 165 -      <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 166 +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
 167      </Lib>
 168      <PostBuildEvent>
 169        <Command>mkdir "$(OutDir)"\include
 170 @@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 171      </ClCompile>
 172      <Link>
 173        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 174 -      <AdditionalDependencies>gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 175 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 176      </Link>
 177      <PostBuildEvent>
 178        <Command>mkdir "$(OutDir)"\include
 179 @@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 180      </ClCompile>
 181      <Link>
 182        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 183 -      <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 184 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 185      </Link>
 186      <PostBuildEvent>
 187        <Command>mkdir "$(OutDir)"\include
 188 @@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 189      </ClCompile>
 190      <Link>
 191        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 192 -      <AdditionalDependencies>gmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 193 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 194      </Link>
 195      <PostBuildEvent>
 196        <Command>mkdir "$(OutDir)"\include
 197 @@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
 198      </ClCompile>
 199      <Link>
 200        <ModuleDefinitionFile>libnettle.def</ModuleDefinitionFile>
 201 -      <AdditionalDependencies>libgmp_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
 202 +      <AdditionalDependencies>gmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 203      </Link>
 204      <PostBuildEvent>
 205        <Command>mkdir "$(OutDir)"\include