You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2023/05/25 18:54:39 UTC
[couchdb-pkg] 01/04: Add s390x support to RHEL 9 RPM packages
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 781f25f4d9ae9042b86ee696be993775e1d9cbf2
Author: Kun-Lu <ku...@ibm.com>
AuthorDate: Tue May 23 09:27:45 2023 -0400
Add s390x support to RHEL 9 RPM packages
Signed-off-by: Kun-Lu <ku...@ibm.com>
---
Makefile | 12 ++++++++++++
build.sh | 3 ++-
rpm/SPECS/couchdb.spec.in | 4 ++--
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 97424f5..e113dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -164,11 +164,23 @@ centos8: SPIDERMONKEY_DEV=mozjs60-devel
centos8: SM_VER=60
centos8: sm-ver-rpm make-rpmbuild centos
+centos-9: DIST=centos-9
+centos-9: centos9
+centos9: SPIDERMONKEY=mozjs78
+centos9: SPIDERMONKEY_DEV=mozjs78-devel
+centos9: SM_VER=78
+centos9: sm-ver-rpm make-rpmbuild centos
+
# Rocky 8 is a CentOS 8 alias
rocky-8: centos-8
rocky-8.6: centos-8
rocky-8.7: centos-8
+# Rocky 9 is a CentOS 9 alias
+rocky-9: centos-9
+# s390x RHEL clone 9 based
+s390x-centos-9: centos-9
+
# aarch64 RHEL-based
aarch64-rhel: DIST=rhel
# Needs 68 for aarch compat, we're using the included one here
diff --git a/build.sh b/build.sh
index a65209a..9fd6e06 100755
--- a/build.sh
+++ b/build.sh
@@ -30,7 +30,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# TODO derive these by interrogating the couchdb-ci repo rather than hard coding the list
DEBIANS="debian-buster debian-bullseye"
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
-CENTOSES="centos-7 centos-8"
+CENTOSES="centos-7 centos-8 centos-9"
XPLAT_BASES="debian-bullseye ubuntu-focal"
XPLAT_ARCHES="arm64 ppc64le s390x"
BINARY_API="https://apache.jfrog.io/artifactory"
@@ -112,6 +112,7 @@ build-all-couch() {
CONTAINERARCH="${arch}" build-couch ${base}
done
done
+ CONTAINERARCH="s390x" build-couch centos-9
}
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 84a9c1a..5c431e5 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -28,8 +28,8 @@ Prefix: %{prefix}
Group: Applications/Databases
URL: https://couchdb.apache.org/
Vendor: The Apache Software Foundation
-BuildArch: x86_64 ppc64le aarch64
-ExclusiveArch: x86_64 ppc64le aarch64
+BuildArch: x86_64 ppc64le aarch64 s390x
+ExclusiveArch: x86_64 ppc64le aarch64 s390x
Exclusiveos: linux
Packager: CouchDB Developers <de...@couchdb.apache.org>
Patch1: 0001-build-with-sm68-on-aarch64.patch