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
This commit is contained in:
MilhouseVH
2019-10-24 22:51:28 +01:00
parent 5e939010e1
commit 92ccff3e5d
2 changed files with 5 additions and 1 deletions

View File

@@ -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
}

View File

@@ -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