perl: reduce patchset and update version

This commit is contained in:
Connor Olding 2022-09-25 20:09:25 -07:00
parent 6696121ab3
commit e24b6d3f43
1 changed files with 5 additions and 17 deletions

View File

@ -3,8 +3,8 @@
# FORK: https://github.com/G4Vi/perl5/tree/cosmo
FROM localhost/notwa-util AS downloader
ARG PERL_COMMIT=154c25ba29a115544bdfe0983c0c938993c00959
ARG PERL_SHA256=9980e388a0b08c0f5830aa9f63cdb3da8d11e460f637bf4622e22c6e8710eff8
ARG PERL_COMMIT=d48f509e4fac172c34109288e16373525f6d1871
ARG PERL_SHA256=ab6faf04d4f9f34a3f01aa702b34d6307c66e1bb453aad692e1972062154ca3f
ARG PERLTIDY_VERSION=20220613
ARG PERLTIDY_SHA256=50496a6952904ef28f495919fc0a67801a63c87779c61308ce1ca5b32467c5d4
@ -73,24 +73,12 @@ RUN : \
;done \
;
# TODO: use -D__W__ at compile-time instead?
RUN : \
&& sed -i '/-Wuninitialized/d' cosmopolitan/o/cosmopolitan.h \
&& sed -i '/-Wmaybe-uninitialized/d' cosmopolitan/o/cosmopolitan.h \
&& sed -i '/-Wuninitialized/d' cosmopolitan/libc/integral/c.inc \
&& sed -i '/-Wmaybe-uninitialized/d' cosmopolitan/libc/integral/c.inc \
&& sed -i '/sock\/sock.h/a\\#include "libc/sock/struct/pollfd.h"' cosmopolitan/libc/isystem/poll.h \
&& sed -i '/sock\/sock.h/a\\#include "libc/sock/struct/pollfd.h"' cosmopolitan/libc/isystem/sys/poll.h \
&& sed -i '/calls\/weirdtypes.h/a\\#include "libc/runtime/sysconf.h"' cosmopolitan/libc/isystem/unistd.h \
&& sed -i '/x86_64-linux-musl/d' perl/hints/cosmo.sh \
&& sed -i '/Which of these apply/c\\dflt=cosmo' perl/Configure \
&& sed -i 's/.*-musl-objcopy/\tobjcopy/g' perl/Makefile.SH \
&& sed -i 's/cp \([^ ]\+\)/chmod +x \1 \&\& cp \1/g' perl/Makefile.SH \
;
WORKDIR perl
RUN : \
&& sed -i '/x86_64-linux-musl/d' hints/cosmo.sh \
&& sed -i 's/.*-musl-objcopy/\tobjcopy/g' Makefile.SH \
\
&& COSMO_MODE="" COSMO_REPO="/cosmopolitan" sh Configure -d -e \
-Dprefix="/zip" \
-Dusedevel \