You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/07/21 01:06:32 UTC
[couchdb-pkg] 01/01: Support use of fake libmozjs185 pkg in
automated pkg builds
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 08eb47a74585dd8ac06f3528b83284839817ea95
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Thu Jul 20 16:43:59 2017 -0400
Support use of fake libmozjs185 pkg in automated pkg builds
---
Makefile | 2 +-
debian/control | 1 +
debian/rules | 4 ++++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c2a9c40..d04458d 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ make-rpmbuild:
# If we don't change $HOME it'll force building in ~/rpmbuild. Boo.
build-rpm:
- cd ../rpmbuild && export HOME=$(readlink -f ..) && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
+ cd .. && export HOME=`pwd` && cd rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
# ######################################
make-js185:
diff --git a/debian/control b/debian/control
index c7a7d3a..b026f38 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Depends: adduser,
curl,
debconf,
init-system-helpers,
+ libmozjs185-1.0,
procps,
python,
python-requests,
diff --git a/debian/rules b/debian/rules
index 825eff6..140be1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,3 +35,7 @@ override_dh_auto_install:
get-orig-source:
uscan --noconf --download-current-version --destdir=. --rename
+
+# this allows us to use a fake/equivs libmozjs185-1.0 in automated testing
+override_dh_shlibdeps:
+ dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.