summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/imports/libcurl.TARGETS6
-rw-r--r--etc/imports/libs.TARGETS9
-rw-r--r--etc/imports/libz.TARGETS6
-rw-r--r--etc/repos.json27
-rw-r--r--etc/repos.template.json27
-rw-r--r--tests/test_cases/deps/TARGETS4
-rw-r--r--tests/test_cases/deps/cmake/TARGETS28
7 files changed, 103 insertions, 4 deletions
diff --git a/etc/imports/libcurl.TARGETS b/etc/imports/libcurl.TARGETS
new file mode 100644
index 0000000..f33a101
--- /dev/null
+++ b/etc/imports/libcurl.TARGETS
@@ -0,0 +1,6 @@
+{ "tree":
+ { "type": "install"
+ , "dirs": [[["TREE", null, "."], "libcurl"]]
+ , "tainted": ["test"]
+ }
+}
diff --git a/etc/imports/libs.TARGETS b/etc/imports/libs.TARGETS
index f455122..57adf74 100644
--- a/etc/imports/libs.TARGETS
+++ b/etc/imports/libs.TARGETS
@@ -1,3 +1,10 @@
{ "tree":
- {"type": "tree", "deps": [["@", "gtest", "", "tree"]], "tainted": ["test"]}
+ { "type": "tree"
+ , "deps":
+ [ ["@", "gtest", "", "tree"]
+ , ["@", "libz", "", "tree"]
+ , ["@", "libcurl", "", "tree"]
+ ]
+ , "tainted": ["test"]
+ }
}
diff --git a/etc/imports/libz.TARGETS b/etc/imports/libz.TARGETS
new file mode 100644
index 0000000..5b5ef8f
--- /dev/null
+++ b/etc/imports/libz.TARGETS
@@ -0,0 +1,6 @@
+{ "tree":
+ { "type": "install"
+ , "dirs": [[["TREE", null, "."], "libz"]]
+ , "tainted": ["test"]
+ }
+}
diff --git a/etc/repos.json b/etc/repos.json
index 793f954..d86dbd7 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -29,7 +29,7 @@
, "test-libs":
{ "repository": "imports"
, "target_file_name": "libs.TARGETS"
- , "bindings": {"gtest": "gtest"}
+ , "bindings": {"gtest": "gtest", "libz": "libz", "libcurl": "libcurl"}
}
, "gtest":
{ "repository":
@@ -42,6 +42,31 @@
, "target_root": "imports"
, "target_file_name": "gtest.TARGETS"
}
+ , "libz":
+ { "repository":
+ { "type": "archive"
+ , "content": "d115fc690fa59d3be51b3442158876536140b6c2"
+ , "fetch": "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz"
+ , "sha256": "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
+ , "sha512": "99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad"
+ , "subdir": "zlib-1.2.13"
+ }
+ , "target_root": "imports"
+ , "target_file_name": "libz.TARGETS"
+ }
+ , "libcurl":
+ { "repository":
+ { "type": "archive"
+ , "content": "540b4de2edfa015b894ad86d51b33a55f451ac99"
+ , "fetch": "https://github.com/curl/curl/releases/download/curl-8_0_1/curl-8.0.1.tar.gz"
+ , "sha256": "5fd29000a4089934f121eff456101f0a5d09e2a3e89da1d714adf06c4be887cb"
+ , "sha512": "87d945e65176613c6296f8b130bd6c5355e3ca3c62ee4010edd481950cad9760482fd3be8a84e51501c118c29ebc284b8f87c49b06f9d248e9da5819fda38f8f"
+ , "subdir": "curl-8.0.1"
+ }
+ , "target_root": "imports"
+ , "target_file_name": "libcurl.TARGETS"
+ , "bindings": {"libz": "libz"}
+ }
, "just":
{ "repository":
{ "type": "git"
diff --git a/etc/repos.template.json b/etc/repos.template.json
index b18b665..3f1e1e5 100644
--- a/etc/repos.template.json
+++ b/etc/repos.template.json
@@ -29,7 +29,7 @@
, "test-libs":
{ "repository": "imports"
, "target_file_name": "libs.TARGETS"
- , "bindings": {"gtest": "gtest"}
+ , "bindings": {"gtest": "gtest", "libz": "libz", "libcurl": "libcurl"}
}
, "gtest":
{ "repository":
@@ -42,5 +42,30 @@
, "target_root": "imports"
, "target_file_name": "gtest.TARGETS"
}
+ , "libz":
+ { "repository":
+ { "type": "archive"
+ , "content": "d115fc690fa59d3be51b3442158876536140b6c2"
+ , "fetch": "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz"
+ , "sha256": "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
+ , "sha512": "99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad"
+ , "subdir": "zlib-1.2.13"
+ }
+ , "target_root": "imports"
+ , "target_file_name": "libz.TARGETS"
+ }
+ , "libcurl":
+ { "repository":
+ { "type": "archive"
+ , "content": "540b4de2edfa015b894ad86d51b33a55f451ac99"
+ , "fetch": "https://github.com/curl/curl/releases/download/curl-8_0_1/curl-8.0.1.tar.gz"
+ , "sha256": "5fd29000a4089934f121eff456101f0a5d09e2a3e89da1d714adf06c4be887cb"
+ , "sha512": "87d945e65176613c6296f8b130bd6c5355e3ca3c62ee4010edd481950cad9760482fd3be8a84e51501c118c29ebc284b8f87c49b06f9d248e9da5819fda38f8f"
+ , "subdir": "curl-8.0.1"
+ }
+ , "target_root": "imports"
+ , "target_file_name": "libcurl.TARGETS"
+ , "bindings": {"libz": "libz"}
+ }
}
}
diff --git a/tests/test_cases/deps/TARGETS b/tests/test_cases/deps/TARGETS
index 909cb4b..10a6749 100644
--- a/tests/test_cases/deps/TARGETS
+++ b/tests/test_cases/deps/TARGETS
@@ -151,7 +151,7 @@
, "cmake":
{ "type": ["test_rules", "test_case"]
, "name": ["deps_cmake"]
- , "libs": ["googletest"]
+ , "libs": ["googletest", "libz", "libcurl"]
, "targets":
[ "+gtest"
, "+test"
@@ -161,6 +161,7 @@
, "+install_gtest"
, "+install_gtest_main"
, "+install_testbin"
+ , "+install_libcurl"
]
, "asserts":
[ "test -f gtest/libgtest.a"
@@ -184,6 +185,7 @@
, "grep 'Libs.*libgtest_main.so.1.13.0' install_gtest_main/lib/pkgconfig/gtest_main.pc"
, "grep 'Libs.*lib/pkgconfig/gtest_main.ldflags' install_gtest_main/lib/pkgconfig/gtest_main.pc"
, "./install_testbin/bin/test | grep 'PASSED.*1 test'"
+ , "path=$(ldd install_libcurl/lib/libcurl.so.4.8.0 | awk '/libz/{print $3}') && test -z \"${path##$(pwd)*}\""
]
, "data": [["TREE", null, "cmake"]]
}
diff --git a/tests/test_cases/deps/cmake/TARGETS b/tests/test_cases/deps/cmake/TARGETS
index 74633b9..7b3bf6f 100644
--- a/tests/test_cases/deps/cmake/TARGETS
+++ b/tests/test_cases/deps/cmake/TARGETS
@@ -49,4 +49,32 @@
}
, "install_testbin":
{"type": ["@", "rules", "CC", "install-with-deps"], "targets": ["testbin"]}
+, "libz":
+ { "type": ["@", "rules", "CC/foreign/cmake", "library"]
+ , "name": ["libz"]
+ , "version": ["1", "2", "13"]
+ , "project": [["@", "libz", "", "tree"]]
+ , "defines": ["BUILD_SHARED_LIBS=ON"]
+ , "post_cmds":
+ [ "cp lib/libz.so.1.2.13 lib/libz.so"
+ , "cp lib/libz.so.1.2.13 lib/libz.so.1"
+ ]
+ , "out_hdrs": ["zconf.h", "zlib.h"]
+ , "out_libs": ["libz.so", "libz.so.1", "libz.so.1.2.13"]
+ , "pc_prefix": ["share/pkgconfig"]
+ , "pkg-config": ["zlib.pc"]
+ }
+, "libcurl":
+ { "type": ["@", "rules", "CC/foreign/cmake", "library"]
+ , "name": ["libcurl"]
+ , "version": ["8", "0", "1"]
+ , "project": [["@", "libcurl", "", "tree"]]
+ , "defines": ["BUILD_SHARED_LIBS=ON", "CURL_ENABLE_SSL=OFF", "USE_ZLIB=ON"]
+ , "out_hdr_dirs": ["curl"]
+ , "out_libs": ["libcurl.so.4.8.0"]
+ , "pkg-config": ["libcurl.pc"]
+ , "deps": ["libz"]
+ }
+, "install_libcurl":
+ {"type": ["@", "rules", "CC", "install-with-deps"], "targets": ["libcurl"]}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 14:05:37 +0000