[ptxdist] [PATCH 1/2] libffi: Adjust build options.

[ptxdist] [PATCH 1/2] libffi: Adjust build options.

[Christian Melki]

When upgrading automake, libffi failed to build due to
a makefile error. The error is triggered when using options
we don't really need. Circumvent the issue by changing options
and also improve a few others.

* Rearrange one option.

* Disable internal builddir in the srcdir and disable using gcc
as discovery for multidir arch directories.

* Force static trampolines. Dynamic ones are a security issue.
Now this might break some programs and probably make debugging
using gobject introspection difficult, but otoh, it stops usage
of self modifying code.

* Keep patches. I guess they can both go away, but I don't
see much harm in continuing to use them.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/libffi.make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/libffi.make b/rules/libffi.make
index 4ccc437d5..f9a6bd397 100644
--- a/rules/libffi.make
+++ b/rules/libffi.make
@@ -33,14 +33,17 @@ LIBFFI_LICENSE_FILES	:= \
 LIBFFI_CONF_TOOL := autoconf
 LIBFFI_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-builddir \
 	--disable-static \
 	--enable-portable-binary \
 	--disable-pax_emutramp \
-	--disable-debug \
 	--disable-docs \
+	--disable-debug \
 	--enable-structs \
 	--enable-raw-api \
+	--enable-exec-static-tramp \
 	--disable-purify-safety \
+	--disable-multi-os-directory \
 	--without-gcc-arch
 
 # ----------------------------------------------------------------------------
-- 
2.34.1

[ptxdist] [PATCH 2/2] host-libffi: Follow target libffi.

[Christian Melki]

Add some useful options to the host build.
We don't need docs, static, internal builddirs and we don't
need multi-lib arch discovery via gcc.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/host-libffi.make | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/host-libffi.make b/rules/host-libffi.make
index fd9736928..1e9412edf 100644
--- a/rules/host-libffi.make
+++ b/rules/host-libffi.make
@@ -18,6 +18,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBFFI) += host-libffi
 HOST_LIBFFI_CONF_TOOL	:= autoconf
 HOST_LIBFFI_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
-	--disable-static
+	--disable-builddir \
+	--disable-static \
+	--disable-docs \
+	--disable-multi-os-directory
 
 # vim: syntax=make
-- 
2.34.1

Re: [ptxdist] [APPLIED] libffi: Adjust build options.

[Michael Olbrich]

Thanks, applied as df21e0052277c9c2ae42f7c03fb36affa0e8088e.

Michael

[sent from post-receive hook]

On Mon, 05 Aug 2024 08:49:39 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> When upgrading automake, libffi failed to build due to
> a makefile error. The error is triggered when using options
> we don't really need. Circumvent the issue by changing options
> and also improve a few others.
> 
> * Rearrange one option.
> 
> * Disable internal builddir in the srcdir and disable using gcc
> as discovery for multidir arch directories.
> 
> * Force static trampolines. Dynamic ones are a security issue.
> Now this might break some programs and probably make debugging
> using gobject introspection difficult, but otoh, it stops usage
> of self modifying code.
> 
> * Keep patches. I guess they can both go away, but I don't
> see much harm in continuing to use them.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240717213557.2353045-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libffi.make b/rules/libffi.make
> index 4ccc437d5e99..f9a6bd397045 100644
> --- a/rules/libffi.make
> +++ b/rules/libffi.make
> @@ -33,14 +33,17 @@ LIBFFI_LICENSE_FILES	:= \
>  LIBFFI_CONF_TOOL := autoconf
>  LIBFFI_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
> +	--disable-builddir \
>  	--disable-static \
>  	--enable-portable-binary \
>  	--disable-pax_emutramp \
> -	--disable-debug \
>  	--disable-docs \
> +	--disable-debug \
>  	--enable-structs \
>  	--enable-raw-api \
> +	--enable-exec-static-tramp \
>  	--disable-purify-safety \
> +	--disable-multi-os-directory \
>  	--without-gcc-arch
>  
>  # ----------------------------------------------------------------------------

Re: [ptxdist] [APPLIED] host-libffi: Follow target libffi.

[Michael Olbrich]

Thanks, applied as 4ed5009f75e1a8e6559499ccad8364698c571088.

Michael

[sent from post-receive hook]

On Mon, 05 Aug 2024 08:49:40 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Add some useful options to the host build.
> We don't need docs, static, internal builddirs and we don't
> need multi-lib arch discovery via gcc.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240717213557.2353045-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-libffi.make b/rules/host-libffi.make
> index fd97369282fb..41b0e72b48e8 100644
> --- a/rules/host-libffi.make
> +++ b/rules/host-libffi.make
> @@ -18,6 +18,9 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBFFI) += host-libffi
>  HOST_LIBFFI_CONF_TOOL	:= autoconf
>  HOST_LIBFFI_CONF_OPT	:= \
>  	$(HOST_AUTOCONF) \
> -	--disable-static
> +	--disable-builddir \
> +	--disable-static \
> +	--disable-docs \
> +	--disable-multi-os-directory
>  
>  # vim: syntax=make