Skip to content

Commit 1d5f1b0

Browse files
committed
Set RUNPATH on perl5/../RRDs.so
CMK-31095 Change-Id: Ife64f7708241bd3c90c4f264710fb084b3c0e59c (cherry picked from commit 70318de)
1 parent de72531 commit 1d5f1b0

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

omd/packages/rrdtool/BUILD

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("@bazel_skylib//rules:copy_directory.bzl", "copy_directory")
22
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", "pkg_mkdirs", "pkg_mklink", "strip_prefix")
33
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
44
load("//bazel/rules:package_wheel.bzl", "package_wheel")
5-
load("//bazel/rules:patchelf.bzl", "set_runpath")
5+
load("//bazel/rules:patchelf.bzl", "set_runpath", "set_runpath_tree")
66

77
exports_files(["skel.permissions"])
88

@@ -104,10 +104,17 @@ copy_directory(
104104
tags = ["manual"],
105105
)
106106

107+
set_runpath_tree(
108+
name = "rrdtool_perl_bindings_runpath",
109+
src = ":rrdtool_bindings_workaround",
110+
rpath = "$ORIGIN",
111+
tags = ["manual"],
112+
)
113+
107114
pkg_files(
108115
name = "rrdtool_perl_bindings_files",
109-
srcs = [":rrdtool_bindings_workaround"],
110-
strip_prefix = strip_prefix.from_pkg("perl_bindings_dir"),
116+
srcs = [":rrdtool_perl_bindings_runpath"],
117+
strip_prefix = strip_prefix.from_pkg("rrdtool_perl_bindings_runpath"),
111118
tags = ["manual"],
112119
visibility = ["//visibility:public"],
113120
)

omd/packages/rrdtool/BUILD.rrdtool.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ configure_make(
5757
"-Wno-stringop-overflow",
5858
],
5959
env = {
60-
"ORIGIN_VAR": "\\\\$$\\$$ORIGIN",
6160
"RANLIB": "ranlib",
6261
"PERL_DIR": "$$EXT_BUILD_DEPS/omd/packages/perl-modules",
6362
"CFLAGS": "'-Dredacted=\"redacted\"'",

0 commit comments

Comments
 (0)