package/erlang: patch the tarball
diff mbox series

Message ID 20200210165824.22245-1-johan.oudinet@gmail.com
State Accepted
Headers show
Series
  • package/erlang: patch the tarball
Related show

Commit Message

Johan Oudinet Feb. 10, 2020, 4:58 p.m. UTC
Remove the lib/ssl/src/deps directory before configuring the package.
Otherwise, during the compilation of the ssl app, it may fails by
looking for logger.hrl in the wrong location (bootstrap/lib/kernel
instead of lib/kernel).

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang/erlang.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Frank Vanbever Feb. 11, 2020, 12:14 p.m. UTC | #1
Hi Johan, 

> Remove the lib/ssl/src/deps directory before configuring the package.
> Otherwise, during the compilation of the ssl app, it may fails by
> looking for logger.hrl in the wrong location (bootstrap/lib/kernel
> instead of lib/kernel).
> 
> Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
Tested-by: Frank Vanbever <frank.vanbever@essensium.com>

Thanks for getting to the bottom of this.
I was investigating this and had the following config which consistently 
failed with the logger.hrl file not being found.

BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/
tarballs/br-arm-cortex-a9-glibc-2019.11.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_3=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_PACKAGE_OPENSSL=y
BR2_PACKAGE_ERLANG=y

Applying this patch solves the issue.

Best regards,
Frank
Thomas Petazzoni Feb. 19, 2020, 7:57 p.m. UTC | #2
On Mon, 10 Feb 2020 17:58:24 +0100
Johan Oudinet <johan.oudinet@gmail.com> wrote:

> Remove the lib/ssl/src/deps directory before configuring the package.
> Otherwise, during the compilation of the ssl app, it may fails by
> looking for logger.hrl in the wrong location (bootstrap/lib/kernel
> instead of lib/kernel).
> 
> Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
> ---
>  package/erlang/erlang.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Thanks for this work! A link to the autobuilder failure fixed by this
commit was missing in your commit log, so I added it and applied to
master. Thanks!

Thomas

Patch
diff mbox series

diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 3dabfd40b9..f62126f0ad 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -14,6 +14,13 @@  ERLANG_LICENSE = Apache-2.0
 ERLANG_LICENSE_FILES = LICENSE.txt
 ERLANG_INSTALL_STAGING = YES
 
+# Remove the lefover deps directory from the ssl app
+# See https://bugs.erlang.org/browse/ERL-1168
+define ERLANG_REMOVE_SSL_DEPS
+	rm -rf $(@D)/lib/ssl/src/deps
+endef
+ERLANG_POST_PATCH_HOOKS += ERLANG_REMOVE_SSL_DEPS
+
 # Patched erts/aclocal.m4
 define ERLANG_RUN_AUTOCONF
 	cd $(@D) && PATH=$(BR_PATH) ./otp_build autoconf