From 92ccff3e5d1da2227cf5a8c78e3abf22966e5863 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 24 Oct 2019 22:51:28 +0100 Subject: [PATCH] samba: stop using compile_et installed by e2fsprogs Install the Heimdal version of compile_et (and asn1_compile for completeness) using a heimdal_ prefix to avoid a name clash with e2fsprogs which installs a similar but different (and older) compile_et shell script. Then, tell Samba where to find the new Heimdal binaries. Ref: https://bugzilla.samba.org/show_bug.cgi?id=13856 --- packages/devel/heimdal/package.mk | 3 ++- packages/network/samba/package.mk | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index c1b317bc85..08c436f917 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -29,5 +29,6 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \ makeinstall_host() { mkdir -p $TOOLCHAIN/bin - cp -PR lib/asn1/asn1_compile $TOOLCHAIN/bin + cp -PR lib/asn1/asn1_compile $TOOLCHAIN/bin/heimdal_asn1_compile + cp -PR lib/com_err/compile_et $TOOLCHAIN/bin/heimdal_compile_et } diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index f78730615b..8a3451b22a 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -108,6 +108,9 @@ configure_target() { cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt + export COMPILE_ET=$TOOLCHAIN/bin/heimdal_compile_et + export ASN1_COMPILE=$TOOLCHAIN/bin/heimdal_asn1_compile + PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" \ python_LDFLAGS="" python_LIBDIR="" \ PYTHON=${TOOLCHAIN}/bin/python3 ./configure $PKG_CONFIGURE_OPTS