You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/02/25 15:30:36 UTC
[couchdb-pkg] branch 3.2.1 updated (d59bd6c -> 1c4c992)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch 3.2.1
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.
discard d59bd6c Update package metadata
omit ac4e680 Use --platform to select container arch at runtime
omit 6c69bb2 Default to Erlang 23 + Debian 11
add 7c7eb6d feat: initial js68 support
add 9387f4f feat: add aarch64-rhel build support
add 5869af0 chore: create rpm subfolder for js68
add 54151f7 Default to Erlang 23 + Debian 11
add 7f1e10a Use --platform to select container arch at runtime
new e313056 Backport configure fix to allow SM68 on ARM
new 1c4c992 Update package metadata
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d59bd6c)
\
N -- N -- N refs/heads/3.2.1 (1c4c992)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
Makefile | 13 +
...0001-Properly-test-for-SM60-on-ARM-builds.patch | 29 ++
debian/patches/series | 1 +
.../SOURCES/Exclude-failing-tests-on-s390x.patch | 29 ++
...e-unused-LLVM-and-Rust-build-dependencies.patch | 72 +++++
...able_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch | 10 +
js68/rpm/SOURCES/build-icu-big-endian.patch | 12 +
js68/rpm/SOURCES/copy-headers.patch | 29 ++
js68/rpm/SOURCES/emitter.patch | 14 +
js68/rpm/SOURCES/emitter_test.patch | 27 ++
js68/rpm/SOURCES/fix-soname.patch | 25 ++
...s_data-Write-command-output-to-our-stderr.patch | 34 +++
...ata.py-Decouple-from-Mozilla-build-system.patch | 26 ++
js68/rpm/SOURCES/init_patch.patch | 13 +
js68/rpm/SOURCES/jstests_python-3.patch | 57 ++++
js68/rpm/SOURCES/sources | 1 +
js68/rpm/SOURCES/spidermonkey_checks_disable.patch | 10 +
.../spidermonkey_style_check_disable_s390x.patch | 11 +
js68/rpm/SOURCES/tests-increase-timeout.patch | 22 ++
js68/rpm/SPECS/js68.spec | 336 +++++++++++++++++++++
rpm/SOURCES/0001-build-with-sm68-on-aarch64.patch | 23 ++
rpm/SPECS/couchdb.spec.in | 10 +-
23 files changed, 803 insertions(+), 2 deletions(-)
create mode 100644 debian/patches/0001-Properly-test-for-SM60-on-ARM-builds.patch
create mode 100644 debian/patches/series
create mode 100644 js68/rpm/SOURCES/Exclude-failing-tests-on-s390x.patch
create mode 100644 js68/rpm/SOURCES/Remove-unused-LLVM-and-Rust-build-dependencies.patch
create mode 100644 js68/rpm/SOURCES/armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
create mode 100644 js68/rpm/SOURCES/build-icu-big-endian.patch
create mode 100644 js68/rpm/SOURCES/copy-headers.patch
create mode 100644 js68/rpm/SOURCES/emitter.patch
create mode 100644 js68/rpm/SOURCES/emitter_test.patch
create mode 100644 js68/rpm/SOURCES/fix-soname.patch
create mode 100644 js68/rpm/SOURCES/icu_sources_data-Write-command-output-to-our-stderr.patch
create mode 100644 js68/rpm/SOURCES/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
create mode 100644 js68/rpm/SOURCES/init_patch.patch
create mode 100644 js68/rpm/SOURCES/jstests_python-3.patch
create mode 100644 js68/rpm/SOURCES/sources
create mode 100644 js68/rpm/SOURCES/spidermonkey_checks_disable.patch
create mode 100644 js68/rpm/SOURCES/spidermonkey_style_check_disable_s390x.patch
create mode 100644 js68/rpm/SOURCES/tests-increase-timeout.patch
create mode 100644 js68/rpm/SPECS/js68.spec
create mode 100644 rpm/SOURCES/0001-build-with-sm68-on-aarch64.patch
[couchdb-pkg] 02/02: Update package metadata
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch 3.2.1
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 1c4c992291bc743b07494c2e42142ec25a12cab9
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Feb 7 09:35:56 2022 -0500
Update package metadata
---
Makefile | 7 +++++--
rpm/SPECS/couchdb.spec.in | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 34d849c..196fc46 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,10 @@
# the License.
COUCHDIR=../couchdb
-DEBCHANGELOG="Automatically generated package from upstream."
+DEBCHANGELOG="Bump to Erlang 23"
+
+# Define DEBVERSION to append a package version to the upstream CouchDB version
+DEBVERSION="1"
JS_DEBCHANGELOG="Automatically generated package from couchdb-ci repository."
JS_VERSION=1.8.5-1.0.0+couch-2
@@ -194,7 +197,7 @@ copy-debian:
cp -R debian $(DISTDIR)
update-changelog:
- cd $(DISTDIR) && dch -v $(VERSION)~$(PLATFORM) $(DEBCHANGELOG)
+ cd $(DISTDIR) && dch -v $(VERSION)-$(DEBVERSION)~$(PLATFORM) $(DEBCHANGELOG)
dpkg:
cd $(DISTDIR) && dpkg-buildpackage -b -us -uc
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 990d8b8..2ba1a35 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -18,7 +18,7 @@ Summary: RESTful document oriented database
License: Apache License v2.0
Name: %{name}
Version: %{_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: https://www.apache.org/dist/couchdb/source/${version}/apache-couchdb-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.init
[couchdb-pkg] 01/02: Backport configure fix to allow SM68 on ARM
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch 3.2.1
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit e3130565e617abcd41321190e195fc4935b780ae
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Feb 7 11:56:56 2022 -0500
Backport configure fix to allow SM68 on ARM
---
...0001-Properly-test-for-SM60-on-ARM-builds.patch | 29 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 30 insertions(+)
diff --git a/debian/patches/0001-Properly-test-for-SM60-on-ARM-builds.patch b/debian/patches/0001-Properly-test-for-SM60-on-ARM-builds.patch
new file mode 100644
index 0000000..40fd1ca
--- /dev/null
+++ b/debian/patches/0001-Properly-test-for-SM60-on-ARM-builds.patch
@@ -0,0 +1,29 @@
+From 016385f408e83e4058fbc8116c257fd579cc5688 Mon Sep 17 00:00:00 2001
+From: Adam Kocoloski <ko...@apache.org>
+Date: Thu, 20 Jan 2022 19:55:32 -0500
+Subject: [PATCH] Properly test for SM60 on ARM builds
+
+Already fixed by @lostnet on main.
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 9c22181a1..0bcbfaef3 100755
+--- a/configure
++++ b/configure
+@@ -224,9 +224,9 @@ parse_opts() {
+
+ parse_opts $@
+
+-if [ "${ARCH}" = "aarch64" ] && [ "${SM_VSN}" != "1.8.5" ]
++if [ "${ARCH}" = "aarch64" ] && [ "${SM_VSN}" = "60" ]
+ then
+- echo "ERROR: SpiderMonkey 60 is known broken on ARM 64 (aarch64). Use 1.8.5 instead."
++ echo "ERROR: SpiderMonkey 60 is known broken on ARM 64 (aarch64). Use another version instead."
+ exit 1
+ fi
+
+--
+2.34.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ae636c4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Properly-test-for-SM60-on-ARM-builds.patch