Skip to contentSkip to conversation

ejabberd: Call check-erlang-lib script directly from its location

PATCH New Johan Oudinet 2 participants 2 messages Feb 13, 2018 – May 20, 2018

lore
Share & tools
lore

Johan Oudinet

author
#0 lore raw

PATCH 1/1 ejabberd: Call check-erlang-lib script directly from its location

Avoid installing check-erlang-lib in the directory where the tarball is extracted. Instead, use an absolute path to its actual location, i.e.:
$(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib

Signed-off-by Johan Oudinet <[email protected]>
---
 package/ejabberd/ejabberd.mk | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
package/ejabberd/ejabberd.mk +2 -11
index 0f7af9b83e..acd52e5b38 100644
@@ -23,24 +23,15 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 EJABBERD_DEPENDENCIES += linux-pam
 endif
 
-# Install check-erlang-lib script to the directory in which the
-# package has been uncompressed, so it is available during the
-# configure step.
-define EJABBERD_INSTALL_CHECK_ERLANG_LIB
-	$(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \
-		$(@D)/check-erlang-lib
-endef
-
-EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB
-
 EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler
 
 # Guess answers for these tests, configure will bail out otherwise
 # saying error: cannot run test program while cross compiling.
+EJABBERD_CHECK_LIB = $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib
 EJABBERD_CONF_ENV = \
 	ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \
 	$(foreach lib,$(EJABBERD_ERLANG_LIBS), \
-		ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`")
+		ac_cv_erlang_lib_dir_$(lib)="`$(EJABBERD_CHECK_LIB) $(lib)`")
 
 EJABBERD_CONF_OPTS = \
 	--enable-system-deps \
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 ejabberd: Call check-erlang-lib script directly from its location

Hello,

Quoted 8 lines · Johan Oudinet

Avoid installing check-erlang-lib in the directory where the tarball is extracted. Instead, use an absolute path to its actual location, i.e.:
$(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib

Signed-off-by Johan Oudinet <[email protected]>
---
 package/ejabberd/ejabberd.mk | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com