[GitHub] [couchdb-pkg] kocolosk commented on a change in pull request #87: Add JS68 rpmspec and aarch64 RPM builds

[GitBox <gi...@apache.org>]

kocolosk commented on a change in pull request #87:
URL: https://github.com/apache/couchdb-pkg/pull/87#discussion_r789275748



##########
File path: rpm/SPECS/couchdb.spec.in
##########
@@ -28,10 +28,11 @@ Prefix:        %{prefix}
 Group:         Applications/Databases
 URL:           https://couchdb.apache.org/
 Vendor:        The Apache Software Foundation
-BuildArch:     x86_64 ppc64le
-ExclusiveArch: x86_64 ppc64le
+BuildArch:     x86_64 ppc64le aarch64
+ExclusiveArch: x86_64 ppc64le aarch64
 Exclusiveos:   linux
 Packager:      CouchDB Developers <de...@couchdb.apache.org>
+Patch1:        0001-build-with-sm68-on-aarch64.patch

Review comment:
       Guess this can be removed as well then.

##########
File path: rpm/SOURCES/0001-build-with-sm68-on-aarch64.patch
##########
@@ -0,0 +1,23 @@
+From: Peter Lemenkov <le...@gmail.com>
+Date: Thu, 5 Mar 2020 16:36:42 +0300
+Subject: [PATCH] Build with SpiderMonkey 60 on ARM 64
+
+Signed-off-by: Peter Lemenkov <le...@gmail.com>
+
+diff --git a/configure b/configure
+index 38e62e317..995b537f8 100755
+--- a/configure
++++ b/configure
+@@ -178,12 +178,6 @@ parse_opts() {
+
+ parse_opts $@
+
+-if [ "${ARCH}" = "aarch64" ] && [ "${SM_VSN}" != "1.8.5" ]
+-then
+-  echo "ERROR: SpiderMonkey 60 is known broken on ARM 64 (aarch64). Use 1.8.5 instead."
+-  exit 1
+-fi
+-
+ echo "==> configuring couchdb in rel/couchdb.config"
+ cat > rel/couchdb.config << EOF
+ % Licensed under the Apache License, Version 2.0 (the "License"); you may not

Review comment:
       This patch should be removed from the PR. We've fixed it to specifically match for SM_VSN = 60.

##########
File path: rpm/SPECS/couchdb.spec.in
##########
@@ -92,6 +93,11 @@ languages and environments.
 # NOTE: Stripping binaries causes issues so we skip it.
 %define __os_install_post %{nil}
 
+%prep
+%ifarch aarch64
+%patch01 -p1
+%endif
+

Review comment:
       And this, too.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@couchdb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org