From 664b1fe6c19c97939bd9d8ccd0694539ffc24937 Mon Sep 17 00:00:00 2001
From: "Adam V Stephen (ukaea-fpga)" <adam.v.stephen@gmail.com>
Date: Tue, 7 Nov 2023 19:30:54 +0000
Subject: [PATCH] Consistent Dockerfile for gcc-cint 5.18 over Debian buster. 
 Note CXXFLAGS.

---
 avstephen/gcc-cint/Dockerfile | 23 ++++++++++++++++++++++-
 avstephen/gcc-cint/README.md  |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/avstephen/gcc-cint/Dockerfile b/avstephen/gcc-cint/Dockerfile
index 71adc6b..103ff22 100644
--- a/avstephen/gcc-cint/Dockerfile
+++ b/avstephen/gcc-cint/Dockerfile
@@ -29,7 +29,28 @@ RUN apt-get install -y unzip
 
 RUN apt-get install -y libreadline-dev
 
-RUN cd /opt/cint-master/cint-5.18.00 && ./configure --prefix=/opt --/usr/bin/x86_64-linux-gnu/libreadline.so && make && make install
+RUN apt-get install -y vim less
+
+# For the jessie (Debian 8) based image, there was a version plus jre-1.7.0
+# So provide java with the buster update
+RUN apt-get install -y default-jre
+
+# Invoke with --build-arg CACHEBUST=$(date +%s) to force no-cache beyond here
+# Necessary to ensure the configure is rerun to populate the source directory
+
+ARG CACHEBUST=1
+
+RUN cd /opt/cint-master/cint-5.18.00 && ./configure --prefix=/opt --readlinelib=/usr/lib/x86_64-linux-gnu/libreadline.so
+
+RUN cd /opt/cint-master/cint-5.18.00 && sed -i -e 's/CXXFLAGS      =/CXXFLAGS      = -std=gnu++03/g' Makefile 
+
+# Apply CXXFLAGS patch also at the build/ level which is copied into the source level later
+RUN cd /opt/cint-master/cint-5.18.00/build && sed -i -e 's/CXXFLAGS      =/CXXFLAGS      = -std=gnu++03/g' Makefile 
+
+RUN cd /opt/cint-master/cint-5.18.00 && make 
+
+RUN cd /opt/cint-master/cint-5.18.00 && make install
+
  
 
 
diff --git a/avstephen/gcc-cint/README.md b/avstephen/gcc-cint/README.md
index 6a4decc..40ebb31 100644
--- a/avstephen/gcc-cint/README.md
+++ b/avstephen/gcc-cint/README.md
@@ -16,3 +16,5 @@ Provide better links to the above tools
 1. llvm tool
 
 docker buildx build -t avstephen/gcc-cint:buster-20231030-slim -f Dockerfile .
+
+docker buildx build -t avstephen/gcc-cint:buster-20231030-slim -f Dockerfile --build-arg CACHEBUST=$(date +%s) .