[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master-next] 2 commits: rules: Set PKI_JAVA_PATH.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master-next at FreeIPA packaging / dogtag-pki


Commits:
c0a8d666 by Timo Aaltonen at 2020-08-13T22:22:38+03:00
rules: Set PKI_JAVA_PATH.

- - - - -
78729468 by Timo Aaltonen at 2020-08-13T22:23:18+03:00
rules: Drop obsolete WITH_PYTHON options.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -6,6 +6,8 @@ dogtag-pki (10.9.1-1) UNRELEASED; urgency=medium
   * fix-upgrade-script.diff: Fix hardcoding /etc/sysconfig on an upgrade
     script.
   * patches: Refreshed.
+  * rules: Set PKI_JAVA_PATH.
+  * rules: Drop obsolete WITH_PYTHON options.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Wed, 01 Jul 2020 07:06:06 +0300
 


=====================================
debian/rules
=====================================
@@ -12,6 +12,7 @@ VER :=  $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)-.*$$/\1/ p' |
 
 JAVA_HOME=/usr/lib/jvm/java-11-openjdk-$(DEB_BUILD_ARCH)
 PKI_JAVA_HOME=debian/tmp/usr/share/pki/java-home
+PKI_JAVA_PATH=/usr/share/pki/java-home/bin/java
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 export CFLAGS += -I/usr/include/nss $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 export CXXFLAGS += -I/usr/include/nss -I/usr/include/apr-1.0 $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -28,6 +29,7 @@ confflags =
 
 confflags-core = \
 	-DJAVA_HOME=$(JAVA_HOME) \
+	-DPKI_JAVA_PATH=$(PKI_JAVA_PATH) \
 	-DVERSION=$(VER) \
 	-DSYSTEMD_LIB_INSTALL_DIR=/lib/systemd/system \
 	-DVAR_INSTALL_DIR:PATH=/var \
@@ -42,9 +44,6 @@ confflags-core = \
 	-DBUILD_PKI_CONSOLE:BOOL=ON \
 	-DTHEME=dogtag \
 	-DWITH_TEST=OFF \
-	-DWITH_PYTHON2:BOOL=OFF \
-	-DWITH_PYTHON3:BOOL=ON \
-	-DWITH_PYTHON3_DEFAULT:BOOL=ON \
 
 %:
 	dh $@ --with javahelper,python3,apache2 --builddirectory=build/ \



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/98bb5b17936b3e5b678c0a85ee88d8586480be09...7872946893352a2dd666edaec31d323e20a86b10

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/compare/98bb5b17936b3e5b678c0a85ee88d8586480be09...7872946893352a2dd666edaec31d323e20a86b10
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20200813/1dbfdd65/attachment-0001.html>