Skip to content

Commit 8186c28

Browse files
committed
fix xmlsec and rpmio to use ssl dynamically
1 parent 21cdf2d commit 8186c28

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

deps/curl/overlay/overlay.BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ cc_shared_library(
175175
dynamic_deps = [
176176
"@nghttp2//:nghttp2_shared",
177177
"@openssl//:imported_ssl_shared",
178-
"@openssl//:imported_crypto_shared",
178+
# "@openssl//:imported_crypto_shared",
179179
"@zlib//:z",
180180
],
181181
visibility = ["//visibility:public"],

deps/rpm/rpm.BUILD.bazel

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
load("@@//bazel/rules:dd_agent_expand_template.bzl", "dd_agent_expand_template")
12
load("@@//bazel/rules:so_symlink.bzl", "so_symlink")
2-
load("@rules_license//rules:license.bzl", "license")
3+
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
34
load("@rules_cc//cc:cc_library.bzl", "cc_library")
45
load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
5-
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
6-
load("@@//bazel/rules:dd_agent_expand_template.bzl", "dd_agent_expand_template")
6+
load("@rules_license//rules:license.bzl", "license")
77
load("@rules_pkg//pkg:install.bzl", "pkg_install")
88
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
99

@@ -106,7 +106,10 @@ cc_library(
106106
],
107107
deps = [
108108
":misc",
109-
"@openssl//:openssl",
109+
# ORIG "@openssl//:openssl",
110+
"@openssl//:imported_crypto",
111+
"@openssl//:imported_ssl",
112+
"@openssl//:imported_ssl_headers",
110113
"@zstd//:libzstd",
111114
"@popt//:libpopt",
112115
"@lua//:liblua",
@@ -124,11 +127,12 @@ cc_shared_library(
124127
name = "rpmio",
125128
deps = [":librpmio"],
126129
dynamic_deps = [
130+
"@bzip2//:bz2",
131+
"@openssl//:imported_ssl_shared",
127132
"@popt//:popt",
128-
"@zlib//:z",
129133
"@xz//:lzma",
130-
"@bzip2//:bz2",
131-
]
134+
"@zlib//:z",
135+
],
132136
)
133137

134138
genrule(
@@ -141,7 +145,7 @@ genrule(
141145
"@gawk",
142146
],
143147
cmd = "AWK=$(location @gawk) $(location lib/gentagtbl.sh) $(location include/rpm/rpmtag.h) > $@",
144-
outs = ["lib/tagtbl.C"]
148+
outs = ["lib/tagtbl.C"],
145149
)
146150

147151
cc_library(
@@ -252,7 +256,7 @@ cc_shared_library(
252256
":rpmio",
253257
"@sqlite3//:sqlite3",
254258
"@popt//:popt",
255-
]
259+
],
256260
)
257261

258262
so_symlink(
@@ -283,7 +287,7 @@ dd_agent_expand_template(
283287
"@WITH_LZMA_LIB@": "-llzma",
284288
"@WITH_BZ2_LIB@": "-lbz2",
285289
"@WITH_ZLIB_LIB@": "-lz",
286-
"@LUA_LIBS@": "-llua"
290+
"@LUA_LIBS@": "-llua",
287291
},
288292
template = "rpm.pc.in",
289293
)

deps/xmlsec/xmlsec.BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
21
load("@@//bazel/rules:so_symlink.bzl", "so_symlink")
2+
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
3+
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
34
load("@rules_cc//cc:cc_library.bzl", "cc_library")
45
load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
56
load("@rules_license//rules:license.bzl", "license")
67
load("@rules_pkg//pkg:install.bzl", "pkg_install")
78
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
8-
load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
99

1010
package(default_package_metadata = [":license"])
1111

@@ -110,7 +110,6 @@ cc_shared_library(
110110
visibility = ["//visibility:public"],
111111
)
112112

113-
114113
cc_library(
115114
name = "libxmlsec1-openssl",
116115
srcs = [
@@ -143,8 +142,10 @@ cc_library(
143142
deps = [
144143
"@libxslt//:libxslt",
145144
"@libxml2//:libxml2",
146-
"@openssl//:openssl",
147-
":libxmlsec1"
145+
"@openssl//:imported_crypto",
146+
"@openssl//:imported_ssl",
147+
"@openssl//:imported_ssl_headers",
148+
":libxmlsec1",
148149
],
149150
defines = [
150151
"XMLSEC_NO_FTP=1",
@@ -173,6 +174,7 @@ cc_shared_library(
173174
dynamic_deps = [
174175
"@libxslt//:xslt",
175176
"@libxml2//:xml2",
177+
"@openssl//:imported_ssl_shared",
176178
":xmlsec1",
177179
],
178180
visibility = ["//visibility:public"],
@@ -195,7 +197,7 @@ so_symlink(
195197
pkg_files(
196198
name = "headers_files",
197199
srcs = PUBLIC_HEADERS,
198-
prefix = "include/xmlsec1/xmlsec"
200+
prefix = "include/xmlsec1/xmlsec",
199201
)
200202

201203
pkg_files(

0 commit comments

Comments
 (0)