[Buildroot] [PATCH 2/3] package/heimdal: install compile_et
Fabrice Fontaine
fontaine.fabrice at gmail.com
Tue Oct 19 17:25:31 UTC 2021
compile_et is not installed anymore by heimdal since version 7.0.1 and
https://github.com/heimdal/heimdal/commit/e40ef47b57f3c62f94c4056f02ced3af2ed083ca
So remove the broken symlink and install it manually as it is needed for
samba4 because compile_et provided by e2fsprogs raises a build failure
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
package/heimdal/heimdal.mk | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk
index 9a1a68f046..ce509c7afa 100644
--- a/package/heimdal/heimdal.mk
+++ b/package/heimdal/heimdal.mk
@@ -28,19 +28,26 @@ HOST_HEIMDAL_CONF_OPTS = \
--disable-ndbm-db \
--disable-heimdal-documentation
-HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
+# Don't use compile_et from e2fsprogs as it raises a build failure with samba4
+HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true
HEIMDAL_LICENSE = BSD-3-Clause
HEIMDAL_LICENSE_FILES = LICENSE
HEIMDAL_CPE_ID_VENDOR = heimdal_project
+# We need compile_et for samba4
+define HOST_HEIMDAL_INSTALL_COMPILE_ET
+ $(INSTALL) -m 0755 $(@D)/lib/com_err/compile_et \
+ $(HOST_DIR)/bin/compile_et
+endef
+
# We need asn1_compile in the PATH for samba4
define HOST_HEIMDAL_MAKE_SYMLINK
ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \
$(HOST_DIR)/bin/asn1_compile
- ln -sf $(HOST_DIR)/bin/compile_et \
- $(HOST_DIR)/libexec/heimdal/compile_et
endef
-HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK
+HOST_HEIMDAL_POST_INSTALL_HOOKS += \
+ HOST_HEIMDAL_INSTALL_COMPILE_ET \
+ HOST_HEIMDAL_MAKE_SYMLINK
$(eval $(host-autotools-package))
--
2.33.0
More information about the buildroot
mailing list