From 8ac17fb2a72a5262e59e9ed7087e409676acf49a Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Mon, 7 Oct 2024 17:37:09 +0900 Subject: [PATCH] remove libcrypt.so in Dockerfile --- build/Dockerfile | 2 +- build/relocatable-perl-build | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 4593edf..f9ae4ec 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -43,7 +43,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/skaji/relocatable-perl/main/per RUN curl -fsSL --compressed -o /cpm https://raw.githubusercontent.com/skaji/cpm/main/cpm RUN --mount=type=bind,target=src /perl/bin/perl /cpm install -g --cpmfile src/build/cpm.yml -# RUN rm -f /usr/lib64/libcrypt.so /usr/lib64/libcrypt.so.1 +RUN rm -f /usr/lib64/libcrypt.so /usr/lib64/libcrypt.so.1 COPY --from=static-libcrypt /libcrypt.a /usr/lib64/libcrypt.a RUN --mount=type=bind,target=src /perl/bin/perl src/build/relocatable-perl-build --perl_version $(cat src/BUILD_VERSION) --prefix /opt/perl RUN cd /usr/lib64; \ diff --git a/build/relocatable-perl-build b/build/relocatable-perl-build index 662ea20..1a491cf 100644 --- a/build/relocatable-perl-build +++ b/build/relocatable-perl-build @@ -175,9 +175,6 @@ sub perl_build { } } say "---> building perl $perl_version, see $log for progress"; - if ($^O eq "linux") { - system "rm -f /usr/lib64/libcrypt.so /usr/lib64/libcrypt.so.1"; # XXX - } run \@Configure, $log; my @option = $jobs ? ("--jobs=$jobs") : (); run ["make", @option, "install"], $log;