Merge pull request #94 from metwork-framework/add-Xaw3d-devel

build: merge integration branch

Author: thebaptiste

Diff for: CHANGELOG.md

@@ -7,5 +7,14 @@
 - fix devels to install when building openssl 3 (#77)
 - add libzstd-devel for zstd support in PostGreSQL (#78)
 - add lz4 devel for lz4 support in PostGreSQL (#79)
+- add mpich-devel (for eckit and Metview) (#81)
+- add gcc-toolset-11 for gcc 11 (#82)
+- add cargo-c (#83)
+- remove mpich-devel and add libgs-devel (#86)
+- (revert) remove libgs-devel (libtiff incompatibility) (#87)
+- add qt5-qtbase-devel (for Metview interface) (#88)
+- add Qt5 XmlPatterns and Svg devels (#89)
+- remove libtiff-devel (libtiff is now built-in)
+- add libzip-devel (#91)
 
 

Diff for: Dockerfile

@@ -9,8 +9,9 @@ RUN yum -y install epel-release yum-utils
 RUN yum-config-manager --enable powertools
 RUN dnf module -y enable javapackages-tools
 #RUN dnf module -y enable subversion-devel #useful for utf8proc-devel
-RUN yum -y install createrepo wget bzip2 patch make cmake cmake3 ctags automake texinfo file gcc gcc-c++ gcc-gfortran python3 libtool bison flex flex-devel perl-XML-Parser swig gettext libjpeg-turbo freetype fontconfig jasper-libs zlib-devel bzip2-devel libjpeg-turbo-devel freetype-devel fontconfig-devel rpm-build xz xz-devel expat-devel bc which git nspr-devel nss-devel popt-devel elfutils-devel elfutils elfutils-libelf-devel elfutils-libelf elfutils-libs openblas-devel valgrind ncurses-devel gperf libX11-devel libXft-devel libXrender-devel libXext-devel pixman-devel rpcgen libaec-devel tcsh libXmu-devel libXt-devel libXaw-devel byacc imake gsl-devel pcre-devel libev-devel c-ares-devel glib2-devel json-c-devel libxml2-devel libxslt-devel oniguruma-devel libpng-devel graphviz-devel tcl-devel tk-devel libtiff-devel openjpeg2-devel jasper-devel cairo-devel fribidi-devel harfbuzz-devel pango-devel gdbm-devel librsvg2-devel libffi-devel autoconf-archive antlr-C++ antlr-tool uwsgi-plugin-common uwsgi-devel libcap-devel libnghttp2-devel pcre2-devel libzstd-devel lz4-devel mpich-devel rust cargo perl-IPC-Cmd perl-Pod-Html && rpm -qa |sort | md5sum |awk '{print $1;}' >/etc/buildimage_hash
-#Install scl gcc-toolset-11)
+RUN yum -y install createrepo wget bzip2 patch make cmake cmake3 ctags automake texinfo file gcc gcc-c++ gcc-gfortran python3 libtool bison flex flex-devel perl-XML-Parser swig gettext libjpeg-turbo freetype fontconfig jasper-libs zlib-devel bzip2-devel libjpeg-turbo-devel freetype-devel fontconfig-devel rpm-build xz xz-devel expat-devel bc which git nspr-devel nss-devel popt-devel elfutils-devel elfutils elfutils-libelf-devel elfutils-libelf elfutils-libs openblas-devel valgrind ncurses-devel gperf libX11-devel libXft-devel libXrender-devel libXext-devel pixman-devel rpcgen libaec-devel tcsh libXmu-devel libXt-devel libXaw-devel byacc imake gsl-devel pcre-devel libev-devel c-ares-devel glib2-devel json-c-devel libxml2-devel libxslt-devel oniguruma-devel libpng-devel graphviz-devel tcl-devel tk-devel openjpeg2-devel jasper-devel cairo-devel fribidi-devel harfbuzz-devel pango-devel gdbm-devel librsvg2-devel libffi-devel autoconf-archive antlr-C++ antlr-tool uwsgi-plugin-common uwsgi-devel libcap-devel libnghttp2-devel pcre2-devel libzstd-devel lz4-devel rust cargo perl-IPC-Cmd perl-Pod-Html qt5-qtbase-devel qt5-qtxmlpatterns-devel qt5-qtsvg-devel libzip-devel Xaw3d-devel && rpm -qa |sort | md5sum |awk '{print $1
+;}' >/etc/buildimage_hash
+#Install scl gcc-toolset-11
 RUN yum -y install gcc-toolset-11 gcc-toolset-11-annobin-plugin-gcc
 RUN cd /opt/rh/gcc-toolset-11/root/usr/lib/gcc/x86_64-redhat-linux/11/plugin && ln -s annobin.so gcc-annobin.so
 ADD make_openblas_pc.sh /root