diff options
author | robot-piglet <[email protected]> | 2025-08-24 05:22:52 +0300 |
---|---|---|
committer | robot-piglet <[email protected]> | 2025-08-24 05:35:33 +0300 |
commit | b8f1774885eef9f945aa9e93d7d7385c1e83a833 (patch) | |
tree | ee5b90cc80e3e8475b5d58d23a5228c88a4cde47 | |
parent | 0d8fe252505046923951aa3855b1aa34217c23a3 (diff) |
Intermediate changes
commit_hash:03125b11494da1dff24ba2e4f7829ac2b3f02202
6 files changed, 69 insertions, 1 deletions
diff --git a/contrib/deprecated/http-parser/.yandex_meta/__init__.py b/contrib/deprecated/http-parser/.yandex_meta/__init__.py index 6bb05a2a85f..0545cb6c2a2 100644 --- a/contrib/deprecated/http-parser/.yandex_meta/__init__.py +++ b/contrib/deprecated/http-parser/.yandex_meta/__init__.py @@ -2,7 +2,6 @@ from devtools.yamaker.project import NixProject http_parser = NixProject( - owners=["g:mds", "g:cpp-contrib"], arcdir="contrib/deprecated/http-parser", nixattr="http-parser", # By default maximium header size allowed is 80Kb. To remove the effective limit diff --git a/contrib/libs/jwt-cpp/.yandex_meta/__init__.py b/contrib/libs/jwt-cpp/.yandex_meta/__init__.py new file mode 100644 index 00000000000..0612d95106a --- /dev/null +++ b/contrib/libs/jwt-cpp/.yandex_meta/__init__.py @@ -0,0 +1,24 @@ +from devtools.yamaker.arcpath import ArcPath +from devtools.yamaker.modules import Library +from devtools.yamaker.project import NixSourceProject + + +def post_install(self): + self.yamakes["."] = self.module( + Library, + NO_RUNTIME=True, + NO_COMPILER_WARNINGS=True, + PEERDIR=["contrib/libs/openssl"], + ADDINCL=[ArcPath(f"{self.arcdir}/include", ONE_LEVEL=True)], + ) + + +jwt_cpp = NixSourceProject( + arcdir="contrib/libs/jwt-cpp", + nixattr="jwt-cpp", + post_install=post_install, + copy_sources=[ + "include/jwt-cpp/*.h", + "include/picojson/picojson.h", + ], +) diff --git a/contrib/libs/jwt-cpp/.yandex_meta/default.nix b/contrib/libs/jwt-cpp/.yandex_meta/default.nix new file mode 100644 index 00000000000..9837386b595 --- /dev/null +++ b/contrib/libs/jwt-cpp/.yandex_meta/default.nix @@ -0,0 +1,13 @@ +self: super: with self; { + jwt-cpp = stdenv.mkDerivation rec { + pname = "jwt-cpp"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Thalhammer"; + repo = "jwt-cpp"; + rev = "v${version}"; + sha256 = "1nmdyfv0qsam9qv43yrsryfywm4pfpwd4ind4yqdcnq0pv0qlss3"; + }; + }; +} diff --git a/contrib/libs/jwt-cpp/patches/01-clang-cl-windows.patch b/contrib/libs/jwt-cpp/patches/01-clang-cl-windows.patch new file mode 100644 index 00000000000..074f7d151cb --- /dev/null +++ b/contrib/libs/jwt-cpp/patches/01-clang-cl-windows.patch @@ -0,0 +1,11 @@ +--- a/include/picojson/picojson.h ++++ b/include/picojson/picojson.h +@@ -243,7 +243,7 @@ inline value::value(int64_t i) : type_(int64_type), u_() { + + inline value::value(double n) : type_(number_type), u_() { + if ( +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && !defined(__clang__) + !_finite(n) + #elif __cplusplus >= 201103L + std::isnan(n) || std::isinf(n) diff --git a/contrib/libs/jwt-cpp/patches/02-fix-build-when-__STDC_FORMAT_MACROS-prdefined.patch b/contrib/libs/jwt-cpp/patches/02-fix-build-when-__STDC_FORMAT_MACROS-prdefined.patch new file mode 100644 index 00000000000..07ecbaf3c3b --- /dev/null +++ b/contrib/libs/jwt-cpp/patches/02-fix-build-when-__STDC_FORMAT_MACROS-prdefined.patch @@ -0,0 +1,12 @@ +--- a/include/picojson/picojson.h ++++ b/include/picojson/picojson.h +@@ -75,7 +75,9 @@ + + // experimental support for int64_t (see README.mkdn for detail) + #ifdef PICOJSON_USE_INT64 ++#ifndef __STDC_FORMAT_MACROS + #define __STDC_FORMAT_MACROS ++#endif + #include <cerrno> + #if __cplusplus >= 201103L + #include <cinttypes> diff --git a/contrib/libs/jwt-cpp/patches/03-picojson-darwin-format.patch b/contrib/libs/jwt-cpp/patches/03-picojson-darwin-format.patch new file mode 100644 index 00000000000..fa3cfacc553 --- /dev/null +++ b/contrib/libs/jwt-cpp/patches/03-picojson-darwin-format.patch @@ -0,0 +1,9 @@ +--- a/include/picojson/picojson.h (index) ++++ b/include/picojson/picojson.h (working tree) +@@ -487,1 +487,5 @@ inline std::string value::to_str() const { +- SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_); ++#if defined(__APPLE__) ++ SNPRINTF(buf, sizeof(buf), "%lld", u_.int64_); ++#else ++ SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_); ++#endif |