From cb39af36eeb4e6dbe5bc45437fa81c15d0115c12 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Thu, 7 Dec 2023 12:20:51 +0100 Subject: [PATCH] [docker] Update for djgpp, binary archive for curl --- docker/djgpp/Dockerfile | 10 +++++----- docker/djgpp/unpack_zips.sh | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile index feb331e5..329f0819 100644 --- a/docker/djgpp/Dockerfile +++ b/docker/djgpp/Dockerfile @@ -9,7 +9,7 @@ FROM fedora:38 # prepare system RUN dnf -y update && dnf -y install bash wget \ - rsync vim screen git make automake meson unzip cmake patch upx gcc + rsync vim screen git make automake meson unzip cmake patch upx gcc p7zip RUN cd /root; wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-gcc-12.2.0/djcross-gcc-12.2.0-1ap.x86_64.rpm ; \ wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-gcc-12.2.0/djcross-gcc-c++-12.2.0-1ap.x86_64.rpm ; \ @@ -32,8 +32,8 @@ ADD build_libidn2.sh /home/elinks/ RUN runuser -u elinks bash /home/elinks/build_libidn2.sh # openssl -ADD build_openssl.sh /home/elinks/ -RUN runuser -u elinks bash /home/elinks/build_openssl.sh +##ADD build_openssl.sh /home/elinks/ +##RUN runuser -u elinks bash /home/elinks/build_openssl.sh # brotli ADD cc.py /usr/local/bin/cc.py @@ -73,8 +73,8 @@ ADD build_libdom.sh /home/elinks/ RUN runuser -u elinks bash /home/elinks/build_libdom.sh # libcurl -ADD build_curl.sh /home/elinks/ -RUN runuser -u elinks bash /home/elinks/build_curl.sh +##ADD build_curl.sh /home/elinks/ +##RUN runuser -u elinks bash /home/elinks/build_curl.sh # mujs ADD mujs.diff /home/elinks/ diff --git a/docker/djgpp/unpack_zips.sh b/docker/djgpp/unpack_zips.sh index 074aa15a..2a31b5e9 100644 --- a/docker/djgpp/unpack_zips.sh +++ b/docker/djgpp/unpack_zips.sh @@ -3,7 +3,7 @@ mkdir -p lib/pkgconfig mkdir zip cd zip wget http://ftp.delorie.com/pub/djgpp/current/v2tk/expat20br2.zip -wget http://ftp.delorie.com/pub/djgpp/current/v2tk/wat3211b.zip +#wget http://ftp.delorie.com/pub/djgpp/current/v2tk/wat3211b.zip wget http://ftp.delorie.com/pub/djgpp/current/v2tk/zlb13b.zip wget http://ftp.delorie.com/pub/djgpp/current/v2apps/xz-525a.zip wget http://ftp.delorie.com/pub/djgpp/current/v2apps/bz2-108a.zip @@ -12,9 +12,10 @@ wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/licv116b.zip wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/lus0910b.zip wget http://ftp.delorie.com/pub/djgpp/current/v2tk/lua522b.zip wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/rdln80b.zip +wget http://mik.dyndns.pro/dos-stuff/bin/misc-dev.7z mkdir tmp; unzip expat20br2.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp -mkdir tmp; unzip wat3211b.zip -d tmp; mv -f tmp/net/watt/inc tmp/net/watt/include; cp -a tmp/net/watt/include $HOME/; cp -a tmp/net/watt/lib $HOME/; rm -rf tmp +#mkdir tmp; unzip wat3211b.zip -d tmp; mv -f tmp/net/watt/inc tmp/net/watt/include; cp -a tmp/net/watt/include $HOME/; cp -a tmp/net/watt/lib $HOME/; rm -rf tmp mkdir tmp; unzip zlb13b.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp mkdir tmp; unzip xz-525a.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp mkdir tmp; unzip bz2-108a.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp @@ -23,6 +24,11 @@ cp -a tmp/tmp2/sqlite3.pc $HOME/lib/pkgconfig/; rm -rf tmp mkdir tmp; unzip licv116b.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp mkdir tmp; unzip lus0910b.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp mkdir tmp; unzip rdln80b.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp +mkdir tmp; cd tmp; 7za x -y ../misc-dev.7z; cd ..; cp -a tmp/include $HOME/; cp -a tmp/lib $HOME/; rm -rf tmp + +# remove to not break compilation +rm -rf $HOME/include/winsock2.h $HOME/include/ws2tcpip.h + sed -i -e 's|/dev/env/DJDIR|/home/elinks|g' $HOME/lib/pkgconfig/*.pc sed -i -e 's|/dev/env/DJDIR|/home/elinks|g' $HOME/lib/*.la sed -i -e 's/Libs\.private/#Libs.private/' $HOME/lib/pkgconfig/sqlite3.pc