You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by GitBox <gi...@apache.org> on 2018/11/02 19:36:50 UTC

[GitHub] wohali closed pull request #34: debian: Relax Erlang dependencies when building Debian packages on ARM

wohali closed pull request #34: debian: Relax Erlang dependencies when building Debian packages on ARM
URL: https://github.com/apache/couchdb-pkg/pull/34
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/Makefile b/Makefile
index 60a2c87..0e76d8e 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,21 @@ centos6: make-rpmbuild centos
 centos-7: centos7
 centos7: make-rpmbuild centos
 
+# Erlang is built from source on ARMv8
+# These packages are not installed, but the files are present
+drop-deb-deps-for-source-arch:
+	if [ "$(shell arch)" = "aarch64" ]; then                          \
+		sed -i '/erlang-dev/d' $(DISTDIR)/debian/control;         \
+		sed -i '/erlang-crypto/d' $(DISTDIR)/debian/control;      \
+		sed -i '/erlang-dialyzer/d' $(DISTDIR)/debian/control;    \
+		sed -i '/erlang-eunit/d' $(DISTDIR)/debian/control;       \
+		sed -i '/erlang-inets/d' $(DISTDIR)/debian/control;       \
+		sed -i '/erlang-xmerl/d' $(DISTDIR)/debian/control;       \
+		sed -i '/erlang-os-mon/d' $(DISTDIR)/debian/control;      \
+		sed -i '/erlang-reltool/d' $(DISTDIR)/debian/control;     \
+		sed -i '/erlang-syntax-tools/d' $(DISTDIR)/debian/control;\
+	fi
+
 # ######################################
 get-couch:
 	mkdir -p $(COUCHDIR)
@@ -96,7 +111,7 @@ copy-debian:
 	rm -rf $(DISTDIR)/debian
 	cp -R debian $(DISTDIR)
 
-update-changelog:
+update-changelog: drop-deb-deps-for-source-arch
 	cd $(DISTDIR) && dch -v $(VERSION)~$(PLATFORM) $(DEBCHANGELOG)
 
 dpkg:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services