diff mbox

[5/7] freetype: host-freetype-patch requires host-automake

Message ID 1425028764-1146-6-git-send-email-fabio.porcedda@gmail.com
State Accepted
Commit 1c499247ff10e994528e3a9ebfc227d21b5781e7
Headers show

Commit Message

Fabio Porcedda Feb. 27, 2015, 9:19 a.m. UTC
The "make host-freetype-patch" fails because using the autogen.sh script
it doesn't found the autoconf tool, the problem was already fixed for
"make freetype-patch" adding the "host-automake" as a prerequisite to
freetype-patch, so fix it by adding "host-automake" as a prerequisite to
"host-freetype-patch" too.

Fix build failure:
running `autoconf --force'
./autogen.sh: line 15: autoconf: command not found
error while running `autoconf --force'
package/pkg-generic.mk:146: recipe for target 'buildroot/output/build/host-freetype-2.5.5/.stamp_patched' failed

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
 package/freetype/freetype.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Feb. 27, 2015, 2:28 p.m. UTC | #1
Dear Fabio Porcedda,

On Fri, 27 Feb 2015 10:19:22 +0100, Fabio Porcedda wrote:
> The "make host-freetype-patch" fails because using the autogen.sh script
> it doesn't found the autoconf tool, the problem was already fixed for
> "make freetype-patch" adding the "host-automake" as a prerequisite to
> freetype-patch, so fix it by adding "host-automake" as a prerequisite to
> "host-freetype-patch" too.
> 
> Fix build failure:
> running `autoconf --force'
> ./autogen.sh: line 15: autoconf: command not found
> error while running `autoconf --force'
> package/pkg-generic.mk:146: recipe for target 'buildroot/output/build/host-freetype-2.5.5/.stamp_patched' failed
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>

Maybe this has been discussed before, but why are we doing the autogen
in a post patch hook rather than in a pre-configure hook ?

Thomas
Fabio Porcedda Feb. 27, 2015, 6:32 p.m. UTC | #2
On Fri, Feb 27, 2015 at 3:28 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Fabio Porcedda,
>
> On Fri, 27 Feb 2015 10:19:22 +0100, Fabio Porcedda wrote:
>> The "make host-freetype-patch" fails because using the autogen.sh script
>> it doesn't found the autoconf tool, the problem was already fixed for
>> "make freetype-patch" adding the "host-automake" as a prerequisite to
>> freetype-patch, so fix it by adding "host-automake" as a prerequisite to
>> "host-freetype-patch" too.
>>
>> Fix build failure:
>> running `autoconf --force'
>> ./autogen.sh: line 15: autoconf: command not found
>> error while running `autoconf --force'
>> package/pkg-generic.mk:146: recipe for target 'buildroot/output/build/host-freetype-2.5.5/.stamp_patched' failed
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> Maybe this has been discussed before, but why are we doing the autogen
> in a post patch hook rather than in a pre-configure hook ?

Inside the freetype.mk file there is a comment about that:

# POST_PATCH is because we still need to patch libtool after the regen.

The message and hook was added in this commit:

 commit a31a66802a7a1af76a629b0ba7120424ed547646
Author: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date:   Tue Apr 22 14:12:40 2014 -0300

    freetype: security bump to version 2.5.3

    Fixes CVE-2014-2240.

I've tried to use a PRE_CONFIGURE hook but it fails:

>>> host-freetype 2.5.5 Patching
>>> host-freetype 2.5.5 Updating config.sub and config.guess
for file in config.guess config.sub; do for i in $(find
/home/fabiopo/buildroot/br/output/build/host-freetype-2.5.5 -name
$file); do cp support/gnuconfig/$file $i; done; done
>>> host-freetype 2.5.5 Patching libtool

Applying buildroot-libtool-v2.4.patch using patch:
patching file ltmain.sh
Hunk #1 FAILED at 1417.
Hunk #2 FAILED at 2963.
Hunk #3 FAILED at 5176.
Hunk #4 succeeded at 6537 (offset 1352 lines).
Hunk #5 succeeded at 6825 with fuzz 1 (offset 1358 lines).
Hunk #6 succeeded at 7112 (offset 1363 lines).
Hunk #7 succeeded at 8055 with fuzz 2 (offset 1363 lines).
Hunk #8 succeeded at 10647 (offset 1377 lines).
3 out of 8 hunks FAILED -- saving rejects to file ltmain.sh.rej
Patch failed!  Please fix buildroot-libtool-v2.4.patch!

BR
Peter Korsgaard Feb. 28, 2015, 9:11 a.m. UTC | #3
>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:

 > The "make host-freetype-patch" fails because using the autogen.sh script
 > it doesn't found the autoconf tool, the problem was already fixed for
 > "make freetype-patch" adding the "host-automake" as a prerequisite to
 > freetype-patch, so fix it by adding "host-automake" as a prerequisite to
 > "host-freetype-patch" too.

Committed with the commit message slightly reworded, thanks.
diff mbox

Patch

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 0de5ce3..56274cb 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -98,6 +98,7 @@  HOST_FREETYPE_POST_INSTALL_HOOKS += HOST_FREETYPE_FIX_FREETYPE_INCLUDE
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-# freetype-patch uses autogen.sh so add it as a order-only-prerequisite
-# because it is a phony target.
-$(FREETYPE_TARGET_PATCH): | host-automake
+# 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