[Buildroot] [PATCH] freetype: drop calling autogen, no longer needed

[Buildroot] [PATCH] freetype: drop calling autogen, no longer needed

[Thomas Petazzoni]

In commit a31a66802a7a1af76a629b0ba7120424ed547646 ("freetype:
security bump to version 2.5.3"), the freetype package was changed to
call ./autogen.sh to regenerate the autotools stuff, because the
ltmain.sh provided by upstream freetype was not compatible with
Buildroot libtool-patching logic.

Since then, freetype has been bumped several times, and the current
version packaged in Buildroot has an ltmain.sh that is compatible with
our libtool-patching logic.

Therefore, this commit drops the no longer needed autogen stuff.

This autogen stuff was badly breaking per-package host/target
directory, because the autogen happened at the post-patch hook step,
at which point the host-automake/host-autoconf/host-libtool
dependencies have not yet been copied into this package host
directory.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/freetype/freetype.mk | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 05e9498c69..1b3a9d1755 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -17,19 +17,6 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png
 
-# Regen required because the tarball ships with an experimental ltmain.sh
-# that can't be patched by our infra.
-# autogen.sh is because autotools stuff lives in other directories and
-# even AUTORECONF with _OPTS doesn't do it properly.
-# POST_PATCH is because we still need to patch libtool after the regen.
-define FREETYPE_RUN_AUTOGEN
-	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
-endef
-FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN
-HOST_FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN
-FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool
-HOST_FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool
-
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 FREETYPE_DEPENDENCIES += zlib
 FREETYPE_CONF_OPTS += --with-zlib
@@ -72,8 +59,3 @@ FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
-# freetype-patch and host-freetype-patch use autogen.sh so add
-# host-automake as a order-only-prerequisite because it is a phony
-# target.
-$(FREETYPE_TARGET_PATCH) $(HOST_FREETYPE_TARGET_PATCH): | host-automake
-- 
2.14.4

[Buildroot] [PATCH] freetype: drop calling autogen, no longer needed

[Thomas Petazzoni]

Hello,

On Wed,  3 Oct 2018 15:40:01 +0200, Thomas Petazzoni wrote:
> In commit a31a66802a7a1af76a629b0ba7120424ed547646 ("freetype:
> security bump to version 2.5.3"), the freetype package was changed to
> call ./autogen.sh to regenerate the autotools stuff, because the
> ltmain.sh provided by upstream freetype was not compatible with
> Buildroot libtool-patching logic.
> 
> Since then, freetype has been bumped several times, and the current
> version packaged in Buildroot has an ltmain.sh that is compatible with
> our libtool-patching logic.
> 
> Therefore, this commit drops the no longer needed autogen stuff.
> 
> This autogen stuff was badly breaking per-package host/target
> directory, because the autogen happened at the post-patch hook step,
> at which point the host-automake/host-autoconf/host-libtool
> dependencies have not yet been copied into this package host
> directory.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/freetype/freetype.mk | 18 ------------------
>  1 file changed, 18 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH] freetype: drop calling autogen, no longer needed

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > On Wed,  3 Oct 2018 15:40:01 +0200, Thomas Petazzoni wrote:
 >> In commit a31a66802a7a1af76a629b0ba7120424ed547646 ("freetype:
 >> security bump to version 2.5.3"), the freetype package was changed to
 >> call ./autogen.sh to regenerate the autotools stuff, because the
 >> ltmain.sh provided by upstream freetype was not compatible with
 >> Buildroot libtool-patching logic.
 >> 
 >> Since then, freetype has been bumped several times, and the current
 >> version packaged in Buildroot has an ltmain.sh that is compatible with
 >> our libtool-patching logic.
 >> 
 >> Therefore, this commit drops the no longer needed autogen stuff.
 >> 
 >> This autogen stuff was badly breaking per-package host/target
 >> directory, because the autogen happened at the post-patch hook step,
 >> at which point the host-automake/host-autoconf/host-libtool
 >> dependencies have not yet been copied into this package host
 >> directory.
 >> 
 >> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 >> ---
 >> package/freetype/freetype.mk | 18 ------------------
 >> 1 file changed, 18 deletions(-)

Committed to 2018.02.x and 2018.08.x, thanks.

-- 
Bye, Peter Korsgaard