curl -> wget

skaji · Oct 7, 2024 · b798f95 · b798f95
1 parent dc5f183
commit b798f95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -27,7 +27,7 @@ RUN yum install -y \
     gcc \
     make \
     tar \
-    curl \
+    wget \
     patch \
     xz
 RUN mkdir -p \
@@ -39,11 +39,11 @@ RUN mkdir -p \
     /usr/lib64 \
     /usr/local/lib \
     /usr/local/lib64
-RUN curl -fsSL https://raw.githubusercontent.com/skaji/relocatable-perl/main/perl-install | bash -s /perl
-RUN curl -fsSL --compressed -o /cpm https://raw.githubusercontent.com/skaji/cpm/main/cpm
+RUN wget -q -O - https://raw.githubusercontent.com/skaji/relocatable-perl/main/perl-install | bash -s /perl
+RUN wget -q -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
@@ -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;