summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/import/TARGETS.boringssl3
-rw-r--r--etc/import/TARGETS.cli111
-rw-r--r--etc/import/TARGETS.git26
-rw-r--r--etc/import/TARGETS.grpc84
-rw-r--r--etc/import/TARGETS.gsl5
-rw-r--r--etc/import/TARGETS.json6
-rw-r--r--etc/import/TARGETS.protobuf43
-rw-r--r--etc/import/TARGETS.zlib3
-rw-r--r--etc/import/src/TARGETS.git23
-rw-r--r--etc/import/src/compiler/TARGETS.grpc3
-rw-r--r--etc/import/src/google/protobuf/TARGETS.protobuf63
11 files changed, 148 insertions, 72 deletions
diff --git a/etc/import/TARGETS.boringssl b/etc/import/TARGETS.boringssl
index 5a853421..2c117f4c 100644
--- a/etc/import/TARGETS.boringssl
+++ b/etc/import/TARGETS.boringssl
@@ -53,6 +53,8 @@
, "crypto-lib":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["crypto"]
+ , "pkg-name": ["libcrypto"]
+ , "cflags": ["-Wno-gnu-anonymous-struct", "-Wno-nested-anon-types"]
, "hdrs": [["./", "src/include/openssl", "crypto_headers"]]
, "private-hdrs": ["fips_fragments", "crypto_internal_headers"]
, "srcs": ["crypto_sources", "crypto_sources_asm"]
@@ -62,6 +64,7 @@
, "ssl-lib":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["ssl"]
+ , "pkg-name": ["libssl"]
, "hdrs": [["./", "src/include/openssl", "ssl_headers"]]
, "private-hdrs": ["ssl_internal_headers", "crypto_internal_headers"]
, "srcs": ["ssl_sources"]
diff --git a/etc/import/TARGETS.cli11 b/etc/import/TARGETS.cli11
index 37f3e96d..3ebfdfa6 100644
--- a/etc/import/TARGETS.cli11
+++ b/etc/import/TARGETS.cli11
@@ -1,5 +1,6 @@
{ "cli11":
{ "type": ["@", "rules", "CC", "library"]
+ , "name": ["CLI11"]
, "hdrs": [["./", "include/CLI", "cli11_headers"]]
}
}
diff --git a/etc/import/TARGETS.git2 b/etc/import/TARGETS.git2
index a6293636..c34b02fe 100644
--- a/etc/import/TARGETS.git2
+++ b/etc/import/TARGETS.git2
@@ -1,6 +1,6 @@
{ "git2":
{ "type": "export"
- , "target": "git2configured"
+ , "target": "libgit2configured"
, "doc": ["The Git linkable library"]
, "flexible_config":
[ "OS"
@@ -79,7 +79,7 @@
, "WINHTTP": ["boolean. use \"WinHTTP\" if \"USE_HTTPS\" is true"]
}
}
-, "git2configured":
+, "libgit2configured":
{ "type": "configure"
, "arguments_config":
[ "OS"
@@ -101,7 +101,7 @@
, "USE_HTTP_PARSER"
, "USE_BUNDLED_ZLIB"
]
- , "target": ["./", "src", "git2internal"]
+ , "target": ["./", "src", "libgit2"]
, "config":
{ "type": "let*"
, "bindings":
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index c5981b87..baadd06a 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -92,7 +92,7 @@
, ["@", "absl", "absl/time", "time"]
]
}
-, "gpr":
+, "gpr_internal":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["gpr"]
, "hdrs": [["./", "include/grpc", "gpr_public_headers"]]
@@ -1416,7 +1416,7 @@
, "grpc_server_backward_compatibility"
]
}
-, "grpc":
+, "grpc_internal":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["grpc"]
, "srcs":
@@ -1517,28 +1517,10 @@
, "hdrs":
[ ["./", "include/grpc++", "grpc++_config_proto_headers"]
, ["./", "include/grpcpp", "grpcpp_config_proto_headers"]
- , ["@", "protobuf", ".", "protobuf_headers"]
]
+ , "deps": [["@", "protobuf", ".", "libprotobuf"]]
}
, "grpc++_codegen_proto":
- { "type": "export"
- , "target": "grpc++_codegen_proto (implementation)"
- , "flexible_config":
- [ "OS"
- , "ARCH"
- , "TARGET_ARCH"
- , "COMPILER_FAMILY"
- , "AR"
- , "CC"
- , "CFLAGS"
- , "ADD_CFLAGS"
- , "CXX"
- , "CXXFLAGS"
- , "ADD_CXXFLAGS"
- , "ENV"
- ]
- }
-, "grpc++_codegen_proto (implementation)":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["grpc++_codegen_proto"]
, "hdrs":
@@ -1611,4 +1593,64 @@
, "ENV"
]
}
+, "grpc":
+ { "type": "export"
+ , "target": "grpc_internal"
+ , "flexible_config":
+ [ "OS"
+ , "ARCH"
+ , "HOST_ARCH"
+ , "TARGET_ARCH"
+ , "COMPILER_FAMILY"
+ , "DEBUG"
+ , "CC"
+ , "CXX"
+ , "CFLAGS"
+ , "CXXFLAGS"
+ , "ADD_CFLAGS"
+ , "ADD_CXXFLAGS"
+ , "AR"
+ , "ENV"
+ ]
+ }
+, "gpr":
+ { "type": "export"
+ , "target": "gpr_internal"
+ , "flexible_config":
+ [ "OS"
+ , "ARCH"
+ , "HOST_ARCH"
+ , "TARGET_ARCH"
+ , "COMPILER_FAMILY"
+ , "DEBUG"
+ , "CC"
+ , "CXX"
+ , "CFLAGS"
+ , "CXXFLAGS"
+ , "ADD_CFLAGS"
+ , "ADD_CXXFLAGS"
+ , "AR"
+ , "ENV"
+ ]
+ }
+, "grpc_cpp_plugin":
+ { "type": "export"
+ , "target": ["src/compiler", "grpc_cpp_plugin"]
+ , "flexible_config":
+ [ "OS"
+ , "ARCH"
+ , "HOST_ARCH"
+ , "TARGET_ARCH"
+ , "COMPILER_FAMILY"
+ , "DEBUG"
+ , "CC"
+ , "CXX"
+ , "CFLAGS"
+ , "CXXFLAGS"
+ , "ADD_CFLAGS"
+ , "ADD_CXXFLAGS"
+ , "AR"
+ , "ENV"
+ ]
+ }
}
diff --git a/etc/import/TARGETS.gsl b/etc/import/TARGETS.gsl
index b8b6798f..d22e25b2 100644
--- a/etc/import/TARGETS.gsl
+++ b/etc/import/TARGETS.gsl
@@ -1,5 +1,8 @@
{ "gsl-lite":
- {"type": ["@", "rules", "CC", "library"], "hdrs": ["gsl-lite hdrs"]}
+ { "type": ["@", "rules", "CC", "library"]
+ , "name": ["gsl-lite"]
+ , "hdrs": ["gsl-lite hdrs"]
+ }
, "gsl-lite hdrs":
{ "type": "tree"
, "name": "gsl-lite"
diff --git a/etc/import/TARGETS.json b/etc/import/TARGETS.json
index f1aea866..56022d43 100644
--- a/etc/import/TARGETS.json
+++ b/etc/import/TARGETS.json
@@ -1,4 +1,8 @@
-{ "json": {"type": ["@", "rules", "CC", "library"], "hdrs": ["json headers"]}
+{ "json":
+ { "type": ["@", "rules", "CC", "library"]
+ , "name": ["nlohmann_json"]
+ , "hdrs": ["json headers"]
+ }
, "json headers":
{ "type": ["@", "rules", "data", "staged"]
, "stage": ["nlohmann"]
diff --git a/etc/import/TARGETS.protobuf b/etc/import/TARGETS.protobuf
index fec905fc..15f7e6d7 100644
--- a/etc/import/TARGETS.protobuf
+++ b/etc/import/TARGETS.protobuf
@@ -24,10 +24,10 @@
, "ADD_CFLAGS"
]
}
-, "protoc_lib":
+, "libprotoc":
{ "type": "export"
, "doc": []
- , "target": ["src/google/protobuf", "protoc_lib"]
+ , "target": ["src/google/protobuf", "libprotoc"]
, "flexible_config":
[ "OS"
, "ARCH"
@@ -45,15 +45,9 @@
, "ADD_CFLAGS"
]
}
-, "protobuf_headers":
+, "libprotobuf":
{ "type": "export"
- , "doc": [""]
- , "target": ["src/google/protobuf", "protobuf_headers"]
- }
-, "C++ runtime":
- { "type": "export"
- , "doc": ["The library every generated C++ proto file depends upon"]
- , "target": ["src/google/protobuf", "protobuf"]
+ , "target": ["src/google/protobuf", "libprotobuf"]
, "flexible_config":
[ "OS"
, "ARCH"
@@ -64,16 +58,37 @@
, "CXX"
, "CXXFLAGS"
, "ADD_CXXFLAGS"
+ , "AR"
+ , "ENV"
, "CC"
, "CFLAGS"
, "ADD_CFLAGS"
+ ]
+ }
+, "libprotobuf_lite":
+ { "type": "export"
+ , "target": ["src/google/protobuf", "libprotobuf_lite"]
+ , "flexible_config":
+ [ "OS"
+ , "ARCH"
+ , "HOST_ARCH"
+ , "TARGET_ARCH"
+ , "COMPILER_FAMILY"
+ , "DEBUG"
+ , "CXX"
+ , "CXXFLAGS"
+ , "ADD_CXXFLAGS"
, "AR"
, "ENV"
+ , "CC"
+ , "CFLAGS"
+ , "ADD_CFLAGS"
]
}
-, "well_known_protos":
- { "type": "export"
- , "doc": ["Standard well known protobufs"]
- , "target": ["src/google/protobuf", "well_known_protos"]
+, "toolchain_headers": {"type": "install", "deps": ["libprotobuf"]}
+, "toolchain":
+ { "type": "install"
+ , "files": {"bin/protoc": "protoc"}
+ , "dirs": [["toolchain_headers", "include"]]
}
}
diff --git a/etc/import/TARGETS.zlib b/etc/import/TARGETS.zlib
index 0078b9da..27f7bf5b 100644
--- a/etc/import/TARGETS.zlib
+++ b/etc/import/TARGETS.zlib
@@ -33,7 +33,8 @@
}
, "zlibinternal":
{ "type": ["@", "rules", "CC", "library"]
- , "name": ["zlib"]
+ , "name": ["z"]
+ , "pkg-name": ["zlib"]
, "pure C": ["YES"]
, "srcs":
[ "adler32.c"
diff --git a/etc/import/src/TARGETS.git2 b/etc/import/src/TARGETS.git2
index 2e96ce6c..96369d8b 100644
--- a/etc/import/src/TARGETS.git2
+++ b/etc/import/src/TARGETS.git2
@@ -1,7 +1,8 @@
-{ "git2internal":
+{ "libgit2":
{ "type": ["@", "rules", "CC", "library"]
, "arguments_config": ["OS", "ARCH", "TARGET_ARCH"]
, "name": ["git2"]
+ , "pkg-name": ["libgit2"]
, "pure C": ["yes"]
, "private-defines":
{ "type": "case"
diff --git a/etc/import/src/compiler/TARGETS.grpc b/etc/import/src/compiler/TARGETS.grpc
index 132c58e0..2cb8eb88 100644
--- a/etc/import/src/compiler/TARGETS.grpc
+++ b/etc/import/src/compiler/TARGETS.grpc
@@ -36,8 +36,7 @@
, "ruby_generator_string-inl.h"
, "schema_interface.h"
]
- , "deps":
- [[".", "grpc++_config_proto"], ["@", "protobuf", ".", "protoc_lib"]]
+ , "deps": [[".", "grpc++_config_proto"], ["@", "protobuf", ".", "libprotoc"]]
}
, "grpc_cpp_plugin":
{ "type": "export"
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 81ab28ec..495de145 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -1,4 +1,21 @@
-{ "protobuf_headers":
+{ "well_known_protos":
+ { "type": "install"
+ , "deps":
+ [ "any.proto"
+ , "api.proto"
+ , "compiler/plugin.proto"
+ , "descriptor.proto"
+ , "duration.proto"
+ , "empty.proto"
+ , "field_mask.proto"
+ , "source_context.proto"
+ , "struct.proto"
+ , "timestamp.proto"
+ , "type.proto"
+ , "wrappers.proto"
+ ]
+ }
+, "protobuf_headers":
{ "type": ["@", "rules", "data", "staged"]
, "srcs":
[ "any.h"
@@ -229,12 +246,20 @@
, "wire_format.h"
, "wire_format_lite.h"
, "wrappers.pb.h"
+ , "well_known_protos"
]
, "stage": ["google", "protobuf"]
}
-, "protobuf_lite":
+, "libprotobuf_lite":
{ "type": ["@", "rules", "CC", "library"]
- , "name": ["protobuf_lite"]
+ , "name": ["protobuf-lite"]
+ , "cflags":
+ [ "-Wno-sign-compare"
+ , "-Wno-sign-conversion"
+ , "-Wno-unused-function"
+ , "-Wno-zero-length-array"
+ , "-Wno-deprecated-declarations"
+ ]
, "hdrs": ["protobuf_headers"]
, "srcs":
[ "any_lite.cc"
@@ -266,9 +291,10 @@
, "wire_format_lite.cc"
]
}
-, "protobuf":
+, "libprotobuf":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["protobuf"]
+ , "hdrs": ["protobuf_headers"]
, "srcs":
[ "any.cc"
, "any.pb.cc"
@@ -323,11 +349,11 @@
, "wire_format.cc"
, "wrappers.pb.cc"
]
- , "deps": ["protobuf_lite", ["@", "zlib", "", "zlib"]]
+ , "deps": ["libprotobuf_lite", ["@", "zlib", "", "zlib"]]
}
-, "protoc_lib":
+, "libprotoc":
{ "type": ["@", "rules", "CC", "library"]
- , "name": ["protoc_lib"]
+ , "name": ["libprotoc"]
, "srcs":
[ "compiler/code_generator.cc"
, "compiler/command_line_interface.cc"
@@ -411,32 +437,13 @@
, "compiler/subprocess.cc"
, "compiler/zip_writer.cc"
]
- , "deps": ["protobuf"]
+ , "deps": ["libprotobuf"]
}
, "protoc":
{ "type": ["@", "rules", "CC", "binary"]
, "name": ["protoc"]
, "srcs": ["compiler/main.cc"]
- , "private-deps": ["protoc_lib"]
+ , "private-deps": ["libprotoc"]
, "private-ldflags": ["-pthread"]
}
-, "well_known_proto_files":
- { "type": "install"
- , "deps":
- [ "any.proto"
- , "api.proto"
- , "compiler/plugin.proto"
- , "descriptor.proto"
- , "duration.proto"
- , "empty.proto"
- , "field_mask.proto"
- , "source_context.proto"
- , "struct.proto"
- , "timestamp.proto"
- , "type.proto"
- , "wrappers.proto"
- ]
- }
-, "well_known_protos":
- {"type": "install", "dirs": [["well_known_proto_files", "google/protobuf"]]}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 20:49:15 +0000