[Pkg-openldap-devel] [openldap] 04/06: Disable slapd completely for stage1 build
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Thu Aug 27 00:11:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit ea5e468070606bff64200b1f93d7019723f0f7fd
Author: Ryan Tandy <ryan at nardis.ca>
Date: Wed Aug 26 14:53:27 2015 -0700
Disable slapd completely for stage1 build
---
debian/changelog | 6 ++++--
debian/control | 18 ++++++++++--------
debian/rules | 20 ++++++++++++++++++--
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a618497..a4df746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ openldap (2.4.42+dfsg-2) UNRELEASED; urgency=medium
* Change explicit Pre-Depends: multiarch-support to ${misc:Pre-Depends}, as
recommended by lintian.
- * Omit smbk5pwd from the stage1 build profile, allowing the dependency loop
- with heimdal to be broken for bootstrapping. Thanks Daniel Schepler.
+ * Omit slapd, slapd-dbg, and slapd-smbk5pwd from the stage1 build profile.
+ This allows the dependency loop with heimdal to be broken for
+ bootstrapping, and the dependency on libperl-dev to be avoided for
+ cross-building. Thanks Daniel Schepler and Helmut Grohne.
(Closes: #724518)
* Apply wrap-and-sort to the Build-Depends field.
* Drop libncurses5-dev from Build-Depends, no longer needed since the ud
diff --git a/debian/control b/debian/control
index 00b1e12..8ced4f1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,18 +13,18 @@ Build-Depends: debhelper (>= 9.20140227),
dpkg-dev (>= 1.16.1),
groff-base,
heimdal-multidev <!stage1>,
- libdb5.3-dev,
+ libdb5.3-dev <!stage1>,
libgnutls28-dev,
- libltdl-dev,
- libperl-dev (>= 5.8.0),
+ libltdl-dev <!stage1>,
+ libperl-dev (>= 5.8.0) <!stage1>,
libsasl2-dev,
- libslp-dev,
- libwrap0-dev,
- nettle-dev,
+ libslp-dev <!stage1>,
+ libwrap0-dev <!stage1>,
+ nettle-dev <!stage1>,
perl,
po-debconf,
- time,
- unixodbc-dev
+ time <!stage1>,
+ unixodbc-dev <!stage1>
Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
Standards-Version: 3.9.6
Homepage: http://www.openldap.org/
@@ -35,6 +35,7 @@ Package: slapd
Section: net
Priority: optional
Architecture: any
+Build-Profiles: <!stage1>
Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}),
coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl,
@@ -122,6 +123,7 @@ Package: slapd-dbg
Section: debug
Priority: extra
Architecture: any
+Build-Profiles: <!stage1>
Depends: slapd (= ${binary:Version}), ${misc:Depends}
Description: Debugging information for the OpenLDAP server (slapd)
This package provides detached debugging information for the OpenLDAP
diff --git a/debian/rules b/debian/rules
index 204c8e2..bc5c07e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ CONFIG = $(shell grep -v "^\#" debian/configure.options)
ifeq ($(DEB_HOST_ARCH_OS),hurd)
CONFIG += --disable-bdb --disable-hdb --disable-mdb
endif
+ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ # --disable-slapd should imply --disable-slp, ITS#8224
+ CONFIG += --disable-slapd --disable-slp
+endif
installdir := $(CURDIR)/debian/tmp
builddir := $(CURDIR)/debian/build
@@ -89,16 +93,15 @@ override_dh_auto_build:
dh_auto_build -- $(MAKEVARS)
ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
$(MAKE) -C contrib/slapd-modules/smbk5pwd
-endif
$(MAKE) -C contrib/slapd-modules/autogroup
$(MAKE) -C contrib/slapd-modules/lastbind
$(MAKE) -C contrib/slapd-modules/passwd/sha2
+endif
override_dh_auto_install:
dh_auto_install -- $(MAKEVARS)
ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
-endif
$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
$(MAKE) -C contrib/slapd-modules/lastbind install DESTDIR=$(installdir)
$(MAKE) -C contrib/slapd-modules/passwd/sha2 install DESTDIR=$(installdir)
@@ -107,6 +110,7 @@ endif
for F in $(installdir)/usr/lib/ldap/*.la; do \
sed -i "s/^dependency_libs=.*/dependency_libs=''/" $$F; \
done
+endif
# Check all built libraries for unresolved symbols except for the
# libslapi library. It is a special case since the SLAPI interface
@@ -129,24 +133,30 @@ endif
find $(installdir)/usr/share/man -name \*.8 \
| xargs perl -pi -e 's#(\.TH \w+ 8)C#$$1#'
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
override_dh_install:
dh_install
rm -rf $(CURDIR)/debian/slapd/usr/lib/ldap/smbk5pwd*
chmod 0755 $(CURDIR)/debian/slapd/usr/share/slapd/ldiftopasswd
+endif
override_dh_installinit:
dh_installinit -- "defaults 19 80"
override_dh_strip:
dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
dh_strip -pslapd --dbg-package=slapd-dbg
+endif
dh_strip -Nlibldap-2.4-2 -Nslapd
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
# hardlink these so not confined by apparmor; do this here and not
# in dh_link so that dh_strip doesn't get confused and put the wrong
# binary in the debug package.
for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest slapschema ; do \
ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
done
+endif
override_dh_link:
for pkg in libldap2-dev libldap-2.4-2; do \
@@ -162,20 +172,25 @@ override_dh_makeshlibs:
mkdir -p debian/libldap-2.4-2/DEBIAN
cp -p debian/libldap-2.4-2.shlibs debian/libldap-2.4-2/DEBIAN/shlibs
dpkg-gensymbols -plibldap-2.4-2 -Pdebian/libldap-2.4-2
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \
| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
s/\.so\./-/; p; q }' \
)" >> debian/slapd.substvars
dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed -ne's/slapd:Provides=//p' debian/slapd.substvars)"
+endif
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
override_dh_installdeb:
dh_installdeb
perl -w debian/dh_installscripts-common -p slapd
+endif
override_dh_auto_clean:
dh_auto_clean
# Update translation templates for debconf
debconf-updatepo
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
# Remove our stripped schema from the upstream source area.
if [ -z "$(DFSG_NONFREE)" ]; then \
set -e; for s in debian/schema/*.schema debian/schema/*.ldif; do \
@@ -200,3 +215,4 @@ override_dh_auto_clean:
contrib/slapd-modules/passwd/sha2/pw-sha2.lo \
contrib/slapd-modules/passwd/sha2/pw-sha2.la \
contrib/slapd-modules/passwd/sha2/pw-sha2.o
+endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git
More information about the Pkg-openldap-devel
mailing list