Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • lts-team/packages/samba
  • thctlo/samba-lintianfix
  • arnaudr/samba
  • jrwren/samba
  • paride/samba
  • athos/samba
  • henrich/samba
  • cnotin/samba
  • mimi89999/samba
  • samba-team/samba
  • ahasenack/samba
  • jrtc27/samba
  • noel/samba
13 results
Show changes
Commits on Source (4)
......@@ -481,13 +481,13 @@ Architecture: any
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
Replaces: libldb0
Breaks: ldb-tools (<<1.1.30~),
libldb0,
libldb1 (<< 2:2~),
python-samba (<< 2:4.7.0~),
# sssd had --with-ldb-lib-dir hardcoded until 2.6.3-3
# and we moved our modules when built from samba sources
# samba-dsdb-modules is also broken by this move
sssd (<< 2.6.3-3~),
samba (<<2:4.7.0~),
samba-dsdb-modules (<< 2:4.7.0~),
samba-dsdb-modules (<< 2:4.16.0~),
samba-libs (<< 2:4.7.0~),
samba-testsuite (<< 2:4.7.0~)
Description: LDAP-like embedded database - shared library
......
#! /bin/sh
PY3_INCDIR=$(${PYTHON:-python3}-config --includes |
sed 's,^-I\([^ ]*\).*,\1,')
echo "\
usr/include/samba-4.0/pyldb.h $PY3_INCDIR
usr/include/samba-4.0/pyldb.h
usr/lib/*/libpyldb-util.cpython-*.so
usr/lib/*/pkgconfig/pyldb-util.cpython-*.pc
"
......@@ -3,6 +3,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/buildopts.mk
include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/vendor.mk
# faster version of dpkg/architecture.mk defining only vars we actually need
......@@ -22,12 +23,9 @@ LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}$(if $(filter ${LDB_VERSION},2.5.0)
LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
V = 1
WAF_CMD := PYTHONHASHSEED=1 ${PYTHON} ./buildtools/bin/waf
WAF := ${WAF_CMD} $(if ${V},-v)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
WAF += -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
WAF := PYTHONHASHSEED=1 ${PYTHON} ./buildtools/bin/waf \
$(if ${DEB_BUILD_OPTION_PARALLEL},-j${DEB_BUILD_OPTION_PARALLEL})
WAFv := ${WAF} $(if $V, -v)
conf_args = \
--prefix=/usr \
......@@ -120,7 +118,7 @@ clean install install-arch install-indep: %:
configure: bin/configured.stamp
.PHONY: configure
bin/configured.stamp:
${WAF_CMD} -j 1 configure ${conf_args} || \
${WAF} -j1 configure -C ${conf_args} || \
{ $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
touch $@
......@@ -138,8 +136,8 @@ bin/built.stamp: bin/configured.stamp
# This will pefrorm unnecessary/extra install step (into d/tmp), which
# we'll repeat during actual install stage, but this is definitely
# better/faster than building whole thing for _not_ running from the build dir.
${WAF} --targets=compile_et,asn1_compile
${WAF} install --destdir="${CURDIR}/debian/tmp"
${WAFv} --targets=compile_et,asn1_compile
${WAFv} install --destdir="${CURDIR}/debian/tmp"
touch $@
build-indep:
build: build-arch build-indep
......@@ -163,7 +161,7 @@ testbuild/configured.stamp: testbuild/copied.stamp
# (libsocket-wrapper &Co), but let's just build the bundled ones. There's no
# good reason to use externally-packaged wrappers, they're small to build and
# we don't use them for production build, and extra versioned build-dep hurts.
cd testbuild && ${WAF_CMD} -j 1 configure --enable-selftest -C \
cd testbuild && ${WAF} -j1 configure --enable-selftest -C \
$$(echo '${conf_args}' | \
sed 's|--bundled-libraries=NONE|&,nss_wrapper,pam_wrapper,resolv_wrapper,socket_wrapper,uid_wrapper|')
# FIXME: some tests fail for now, handle them later
......@@ -280,11 +278,13 @@ execute_after_dh_fixperms-arch:
override_dh_makeshlibs:
# generate symbols file with correct cpython suffix in there
pyext=$$(python3-config --extension-suffix | tr _ -); \
pyUP=$$(echo $${pyext%.so} | tr a-z- A-Z_); \
{ echo "libpyldb-util$${pyext}.2 python3-ldb #MINVER#"; \
echo " PYLDB_UTIL$${pyUP}_${LDB_VERSION}@PYLDB_UTIL$${pyUP}_${LDB_VERSION} ${LDB_EPOCH}${LDB_VERSION}"; \
cat debian/python3-ldb.symbols.in; } > debian/python3-ldb.symbols
{ \
suff=$$(python3-config --extension-suffix | tr _ -); \
SUFF=$$(echo "$${suff%.so}" | tr a-z- A-Z_); \
echo "libpyldb-util$${suff}.2 python3-ldb #MINVER#"; \
echo " PYLDB_UTIL$${SUFF}_${LDB_VERSION}@PYLDB_UTIL$${SUFF}_${LDB_VERSION} ${LDB_EPOCH}${LDB_VERSION}"; \
cat debian/python3-ldb.symbols.in; \
} > debian/python3-ldb.symbols
# create symbols and shlibs files in separate wrapper script
# to deal with private libraries
......