aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

[dos] Try to fix Dockerfile

Browse Source
This commit is contained in:
Witold Filipczyk 2022-09-10 12:26:57 +02:00
parent d229ebe89c
commit 516d6aa314
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/djgpp/Dockerfile
View File

@ -11,9 +11,9 @@ FROM fedora:latest
RUN dnf -y update && dnf -y install bash wget \ RUN dnf -y update && dnf -y install bash wget \
rsync vim screen git make automake meson unzip cmake patch rsync vim screen git make automake meson unzip cmake patch
RUN cd /root; wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-gcc-12.1.0/djcross-gcc-12.1.0-1ap.x86_64.rpm ; \ 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.1.0/djcross-gcc-c++-12.1.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 ; \
wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-gcc-12.1.0/djcross-gcc-tools-12.1.0-1ap.x86_64.rpm ; \ wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-gcc-12.2.0/djcross-gcc-tools-12.2.0-1ap.x86_64.rpm ; \
wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-binutils-2.34-1ap.x86_64.rpm ; \ wget http://ftp.delorie.com/pub/djgpp/rpms/djcross-binutils-2.34-1ap.x86_64.rpm ; \
wget http://ftp.delorie.com/pub/djgpp/rpms/djcrx-2.05-5.x86_64.rpm ; \ wget http://ftp.delorie.com/pub/djgpp/rpms/djcrx-2.05-5.x86_64.rpm ; \
rpm -Uhv *.rpm rpm -Uhv *.rpm
@ -84,14 +84,14 @@ make install; \
rm -rf /root/tmp rm -rf /root/tmp
# libxml++5 # libxml++5
RUN dnf -y install mm-common libtool RUN dnf -y install mm-common libtool xz
# libxml++5 cd # libxml++5 cd
RUN mkdir /root/tmp; cd /root/tmp; \ RUN mkdir /root/tmp; cd /root/tmp; \
git clone https://github.com/libxmlplusplus/libxmlplusplus; \ wget https://github.com/libxmlplusplus/libxmlplusplus/releases/download/5.0.2/libxml++-5.0.2.tar.xz; \
cd libxmlplusplus; tar -xf libxml++-5.0.2.tar.xz;
ADD build_xmlplusplus.sh /root/tmp/libxmlplusplus/build_xmlplusplus.sh ADD build_xmlplusplus.sh /root/tmp/libxml++-5.0.2/build_xmlplusplus.sh
RUN cd /root/tmp/libxmlplusplus; \ RUN cd /root/tmp/libxml++-5.0.2; \
./build_xmlplusplus.sh ./build_xmlplusplus.sh
# quickjs # quickjs

1
docker/djgpp/mes_djgpp.sh
View File

@ -6,6 +6,7 @@ LIBRARY_PATH="/usr/local/lib" \
PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" \ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" \
C_INCLUDE_PATH="/usr/local/include" \ C_INCLUDE_PATH="/usr/local/include" \
CFLAGS="-O2 -I/usr/local/include -DWATT32_NO_NAMESPACE" \ CFLAGS="-O2 -I/usr/local/include -DWATT32_NO_NAMESPACE" \
CXXFLAGS="-O2 -I/usr/local/include -DWATT32_NO_NAMESPACE" \
LDFLAGS="-L/usr/local/lib" \ LDFLAGS="-L/usr/local/lib" \
meson /tmp/builddir --cross-file cross/linux-djgpp.txt \ meson /tmp/builddir --cross-file cross/linux-djgpp.txt \
-D88-colors=false \ -D88-colors=false \

1
docker/djgpp/mes_djgpp_js.sh
View File

@ -7,6 +7,7 @@ LIBRARY_PATH="/usr/local/lib" \
PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" \ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" \
C_INCLUDE_PATH="/usr/local/include" \ C_INCLUDE_PATH="/usr/local/include" \
CFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE" \ CFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE" \
CXXFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE" \
LDFLAGS="-L/usr/local/lib" \ LDFLAGS="-L/usr/local/lib" \
meson /tmp/builddir2 --cross-file cross/linux-djgpp.txt \ meson /tmp/builddir2 --cross-file cross/linux-djgpp.txt \
-D88-colors=false \ -D88-colors=false \

2
src/osdep/dos/Makefile
View File

@ -1,6 +1,6 @@
top_builddir=../../.. top_builddir=../../..
include $(top_builddir)/Makefile.config include $(top_builddir)/Makefile.config
OBJS = dos.o OBJS = dos.obj
include $(top_srcdir)/Makefile.lib include $(top_srcdir)/Makefile.lib

0
src/osdep/dos/dos.c → src/osdep/dos/dos.cpp
View File

2
src/osdep/dos/meson.build
View File

@ -1 +1 @@
srcs += files('dos.c') srcs += files('dos.cpp')