[couchdb-pkg] 03/04: Add centos-8, centos-9 and ubuntu-jammy to XPLAT_BASES

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit f9b511079a10ab7e5a8243350383063cc8dae08f
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Wed May 24 15:09:09 2023 -0400

    Add centos-8, centos-9 and ubuntu-jammy to XPLAT_BASES
    
    Signed-off-by: Kun-Lu <ku...@ibm.com>
---
 Makefile                  | 8 ++++++++
 build.sh                  | 8 ++++----
 rpm/SPECS/couchdb.spec.in | 3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 7e8940f..75fdd70 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,10 @@ ubuntu-jammy: SM_VER=78
 ubuntu-jammy: jammy
 jammy: debian
 
+s390x-ubuntu-jammy: ubuntu-jammy
+arm64-ubuntu-jammy: ubuntu-jammy
+ppc64le-ubuntu-jammy: ubuntu-jammy
+
 # RPM default
 centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
 centos: find-couch-dist link-couch-dist build-rpm copy-pkgs
@@ -177,8 +181,12 @@ almalinux-8: centos-8
 almalinux-9: centos-9
 # s390x RHEL 8 clone based
 s390x-centos-8: centos-8
+ppc64le-centos-8: centos-8
 # s390x RHEL 9 clone based
 s390x-centos-9: centos-9
+arm64-centos-9: PKGARCH=aarch64
+arm64-centos-9: centos-9
+ppc64le-centos-9: centos-9
 
 # aarch64 RHEL-based
 aarch64-rhel: DIST=rhel
diff --git a/build.sh b/build.sh
index 4e8af25..1c7eb91 100755
--- a/build.sh
+++ b/build.sh
@@ -31,7 +31,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DEBIANS="debian-buster debian-bullseye"
 UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
 CENTOSES="centos-7 centos-8 centos-9"
-XPLAT_BASES="debian-bullseye ubuntu-focal"
+XPLAT_BASES="debian-bullseye ubuntu-focal ubuntu-jammy centos-8 centos-9"
 XPLAT_ARCHES="arm64 ppc64le s390x"
 BINARY_API="https://apache.jfrog.io/artifactory"
 ERLANGVERSION=${ERLANGVERSION:-24.3.4.10}
@@ -109,11 +109,11 @@ build-all-couch() {
   done
   for base in $XPLAT_BASES; do
     for arch in $XPLAT_ARCHES; do
-      CONTAINERARCH="${arch}" build-couch ${base}
+      if [[ ${base} != "centos-8" ]] || [[ ${arch} != "arm64" ]]; then
+        CONTAINERARCH="${arch}" build-couch ${base}
+      fi
     done
   done
-  CONTAINERARCH="s390x" build-couch centos-8
-  CONTAINERARCH="s390x" build-couch centos-9
 }
 
 
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 5c431e5..863c203 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -94,9 +94,6 @@ languages and environments.
 %define __os_install_post %{nil}
 
 %prep
-%ifarch aarch64
-%patch01 -p1
-%endif
 
 %build
 ./configure --spidermonkey-version=%SM_VER%