diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile index 329f0819..2492e934 100644 --- a/docker/djgpp/Dockerfile +++ b/docker/djgpp/Dockerfile @@ -82,19 +82,19 @@ ADD build_mujs.sh /home/elinks/ RUN runuser -u elinks bash /home/elinks/build_mujs.sh # dosemu -RUN dnf install -y 'dnf-command(copr)' -RUN dnf copr -y enable stsp/dosemu2 -RUN dnf install -y dosemu2 +## RUN dnf install -y 'dnf-command(copr)' +## RUN dnf copr -y enable stsp/dosemu2 +## RUN dnf install -y dosemu2 # get elinks source RUN runuser -u elinks git clone https://github.com/rkd77/elinks /home/elinks/elinks # additional perl packages -RUN dnf install -y perl-autouse +## RUN dnf install -y perl-autouse # dosemu libs -RUN echo /usr/lib64/fdpp > /etc/ld.so.conf.d/dosemu.conf -RUN ldconfig +## RUN echo /usr/lib64/fdpp > /etc/ld.so.conf.d/dosemu.conf +## RUN ldconfig # nojs ADD mes_djgpp.sh /home/elinks/elinks/ diff --git a/docker/djgpp/mes_djgpp.sh b/docker/djgpp/mes_djgpp.sh index 79b0d761..2ce55f6b 100755 --- a/docker/djgpp/mes_djgpp.sh +++ b/docker/djgpp/mes_djgpp.sh @@ -22,6 +22,7 @@ meson setup /tmp/builddir --cross-file cross/linux-djgpp.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \ diff --git a/docker/djgpp/mes_djgpp_js.sh b/docker/djgpp/mes_djgpp_js.sh index f37bef74..4dede44c 100755 --- a/docker/djgpp/mes_djgpp_js.sh +++ b/docker/djgpp/mes_djgpp_js.sh @@ -22,6 +22,7 @@ meson setup /tmp/builddir2 --cross-file cross/linux-djgpp.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \ diff --git a/docker/djgpp/unpack_zips.sh b/docker/djgpp/unpack_zips.sh index 2a31b5e9..21c122b8 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 @@ -15,7 +15,6 @@ 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 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 @@ -25,6 +24,7 @@ mkdir tmp; unzip licv116b.zip -d tmp; cp -a tmp/include $HOME/; cp -a tmp/lib $H 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 +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 # remove to not break compilation rm -rf $HOME/include/winsock2.h $HOME/include/ws2tcpip.h