From 60ccf9dd4454d268ca0eba74fb1065172fdfe103 Mon Sep 17 00:00:00 2001
From: Joe Roberts <joe.t.roberts@jpl.nasa.gov>
Date: Wed, 18 Jan 2023 18:27:40 -0800
Subject: [PATCH] GITC-4100 Support for el9 builds

---
 GNUmakefile                     | 12 ++++++---
 bin/build_el9_docker_image.sh   | 28 ++++++++++++++++++++
 bin/build_el9_rpms_in_docker.sh | 46 +++++++++++++++++++++++++++++++++
 deploy/gibs-gdal/gibs-gdal.spec | 16 ++++++++----
 docker/el9/Dockerfile           |  6 +++++
 mrf_apps/Makefile               |  6 ++---
 6 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100755 bin/build_el9_docker_image.sh
 create mode 100755 bin/build_el9_rpms_in_docker.sh
 create mode 100644 docker/el9/Dockerfile

diff --git a/GNUmakefile b/GNUmakefile
index b93bff6..422e967 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -56,7 +56,7 @@ build/gdal/VERSION:
 	cp mrf_apps/* build/gdal/mrf_apps/
 
 gdal-compile:
-	( cd build/gdal ; ./configure \
+	( cd build/gdal ; sed -i 's/HAVE_CAD	=	yes/HAVE_CAD	=	no/g' GDALmake.opt.in ; ./configure \
 		--prefix=$(PREFIX) \
 		--libdir=$(PREFIX)/$(LIB_DIR) \
 		--mandir=$(PREFIX)/share/man \
@@ -67,7 +67,7 @@ gdal-compile:
 		--without-ogdi \
 		--with-libz \
 		--with-geos \
-		--with-jasper \
+		--with-jasper=no \
 		--with-png \
 		--with-gif \
 		--with-jpeg \
@@ -79,8 +79,12 @@ gdal-compile:
 		--with-gdal-ver=$(GDAL_VERSION) \
 		--disable-rpath \
 		--with-expat \
+		--without-teigha \
+		--without-cad \
+		--without-pg \
+		--with-openjpeg \
 	)
-	$(MAKE) -C build/gdal $(SMP_FLAGS) all man
+	$(MAKE) -C build/gdal $(SMP_FLAGS) man
 
 #-----------------------------------------------------------------------------
 # Install
@@ -146,7 +150,7 @@ mock: gdal-mock
 
 gdal-mock:
 	mock --clean
-	mock --root=gibs-epel-7-$(shell arch) \
+	mock --root=gibs-epel-9-$(shell arch) \
 		dist/gibs-gdal-$(GDAL_VERSION)-*.src.rpm
 
 #-----------------------------------------------------------------------------
diff --git a/bin/build_el9_docker_image.sh b/bin/build_el9_docker_image.sh
new file mode 100755
index 0000000..4dde571
--- /dev/null
+++ b/bin/build_el9_docker_image.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+if ! ls dist/gibs-gdal-*.el9.*.rpm >/dev/null 2>&1; then
+  echo "No RPMs found in ./dist/" >&2
+  exit 1
+fi
+
+TAG="$1"
+
+mkdir -p docker/el9/rpms
+cp dist/gibs-gdal-*.el9.*.rpm docker/el9/rpms/
+rm -f docker/el9/rpms/gibs-gdal-*.src.rpm
+rm -f docker/el9/rpms/gibs-gdal-*debuginfo-*.rpm
+
+(
+  set -e
+  cd docker/el9
+
+  if [ -z "$TAG" ]; then
+    docker build --no-cache .
+  else
+    docker build --no-cache -t "$TAG" .
+  fi
+)
+
+rm -rf docker/el9/rpms
diff --git a/bin/build_el9_rpms_in_docker.sh b/bin/build_el9_rpms_in_docker.sh
new file mode 100755
index 0000000..c50c43d
--- /dev/null
+++ b/bin/build_el9_rpms_in_docker.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -evx
+
+DOCKER_UID=$(id -u)
+DOCKER_GID=$(id -g)
+mkdir -p dist
+cat > dist/build_rpms.sh <<EOS
+#!/bin/sh
+
+set -evx
+
+yum install -y epel-release
+
+dnf install -y 'dnf-command(config-manager)'
+dnf config-manager --set-enabled crb
+
+yum install -y \
+  ccache \
+  wget \
+  rpmdevtools \
+  mock \
+  rsync 
+
+mkdir -p /build
+rsync -av --exclude .git /source/ /build/
+chown -R root:root /build
+
+(
+  set -evx
+  cd /build
+  dnf builddep -y deploy/gibs-gdal/gibs-gdal.spec
+  make download gdal-rpm
+)
+
+cp /build/dist/gibs-gdal-*.rpm /dist/
+EOS
+chmod +x dist/build_rpms.sh
+
+docker run \
+  --rm \
+  --volume "$(pwd):/source:ro" \
+  --volume "$(pwd)/dist:/dist" \
+  rockylinux:9.1 /dist/build_rpms.sh
+
+rm dist/build_rpms.sh
diff --git a/deploy/gibs-gdal/gibs-gdal.spec b/deploy/gibs-gdal/gibs-gdal.spec
index 68e35fc..bceac20 100644
--- a/deploy/gibs-gdal/gibs-gdal.spec
+++ b/deploy/gibs-gdal/gibs-gdal.spec
@@ -1,5 +1,5 @@
 %global gdal_version 2.4.4
-%global gdal_release 4%{?dist}
+%global gdal_release 5%{?dist}
 
 Name:		gibs-gdal
 Version:	%{gdal_version}
@@ -15,8 +15,8 @@ Source1:	http://download.osgeo.org/gdal/%{gdal_version}/gdal-%{gdal_version}.tar
 BuildRequires:  make
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
-BuildRequires:  python36
-BuildRequires:  python36-devel
+BuildRequires:  python3
+BuildRequires:  python3-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -30,8 +30,11 @@ BuildRequires:	doxygen
 BuildRequires:  expat-devel
 BuildRequires:  geos-devel
 BuildRequires:  gcc-c++
-BuildRequires: bzip2
-BuildRequires: /usr/bin/pathfix.py
+BuildRequires:  libstdc++-devel
+BuildRequires:  bzip2
+BuildRequires:  python3-numpy
+BuildRequires:  /usr/bin/pathfix.py
+BuildRequires:  openjpeg2
 
 Requires:  proj
 
@@ -147,6 +150,9 @@ sed -i 's@\/usr\/libexec\/platform-python -s@\/usr\/bin\/env python3@g' /usr/bin
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 18 2023 Joe T. Roberts <joe.t.roberts@jpl.nasa.gov> - 2.4.4-5
+- Support for el9 builds
+
 * Wed Jul 7 2021 Matthew Cechini <matthew.f.cechini@.nasa.gov> - 2.4.4-4
 - Adding install requirement for proj.4
 - Updating linking of /usr/lib64/libproj.so
diff --git a/docker/el9/Dockerfile b/docker/el9/Dockerfile
new file mode 100644
index 0000000..c52ee1f
--- /dev/null
+++ b/docker/el9/Dockerfile
@@ -0,0 +1,6 @@
+FROM rockylinux:9.1
+
+COPY rpms/gibs-gdal-*.el9.*.rpm /rpms/
+
+RUN yum install -y epel-release && yum clean all
+RUN yum install -y /rpms/gibs-gdal-*.el9.*.rpm
diff --git a/mrf_apps/Makefile b/mrf_apps/Makefile
index b17d300..15c3aac 100644
--- a/mrf_apps/Makefile
+++ b/mrf_apps/Makefile
@@ -7,9 +7,9 @@
 include Makefile.lcl
 
 TARGETS = can mrf_insert
-GDAL_INCLUDE = -I $(PREFIX)/include -I $(GDAL_ROOT) -I /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-4.el8.x86_64/usr/include/ -I /build/build/rpmbuild/BUILD/gibs-gdal-2.4.4/build/gdal/
-LIBDIR = /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-4.el8.x86_64/usr/lib64
-BINDIR = /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-4.el8.x86_64/usr/bin/
+GDAL_INCLUDE = -I $(PREFIX)/include -I $(GDAL_ROOT) -I /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-5.el9.x86_64/usr/include/ -I /build/build/rpmbuild/BUILD/gibs-gdal-2.4.4/build/gdal/
+LIBDIR = /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-5.el9.x86_64/usr/lib64
+BINDIR = /build/build/rpmbuild/BUILDROOT/gibs-gdal-2.4.4-5.el9.x86_64/usr/bin/
 CP=cp
 
 INCLUDES = $(GDAL_INCLUDE)