From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] freetype: fix double installation
Date: Thu, 3 Jul 2014 22:26:23 +0200 [thread overview]
Message-ID: <20140703202623.GA23331@free.fr> (raw)
In-Reply-To: <1404418764-3455-1-git-send-email-thomas.petazzoni@free-electrons.com>
Thomas, All,
On 2014-07-03 22:19 +0200, Thomas Petazzoni spake thusly:
[--SNIP--]
> The proposed solution to solve this problem is to remove the symbolic
> in a pre-install hook, run the installation, and restore the symbolic
> link.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/freetype/freetype.mk | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
> index a6ae0a0..b267806 100644
> --- a/package/freetype/freetype.mk
> +++ b/package/freetype/freetype.mk
> @@ -70,12 +70,26 @@ define FREETYPE_FIX_CONFIG_FILE_LIBS
> endef
> FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS
>
> -# Version 2.5.1 reorganized headers out of freetype2/freetype
> -# It's unexpected for some packages so symlink it until it spreads upstream
> +# Version 2.5.1 reorganized headers out of freetype2/freetype It's
> +# unexpected for some packages so symlink it until it spreads
> +# upstream. Note that we also have to remove the symlink prior to the
> +# installation process, because the installation process of freetype
> +# removes usr/include/Freetype2/freetype/config, before installing
> +# something in usr/include/Freetype2/config/ which no longer exists
> +# due to the symbolic link.
> +define FREETYPE_REMOVE_FREETYPE_INCLUDE_SYMLINK
> + $(RM) -f $(STAGING_DIR)/usr/include/freetype2/freetype
> +endef
> +FREETYPE_PRE_INSTALL_STAGING_HOOKS += FREETYPE_REMOVE_FREETYPE_INCLUDE_SYMLINK
> define FREETYPE_FIX_FREETYPE_INCLUDE
> ln -sf . $(STAGING_DIR)/usr/include/freetype2/freetype
> endef
> FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_FREETYPE_INCLUDE
> +
> +define HOST_FREETYPE_REMOVE_FREETYPE_INCLUDE_SYMLINK
> + $(RM) -f $(HOST_DIR)/usr/include/freetype2/freetype
> +endef
> +HOST_FREETYPE_PRE_INSTALL_HOOKS += FREETYPE_REMOVE_FREETYPE_INCLUDE_SYMLINK
> define HOST_FREETYPE_FIX_FREETYPE_INCLUDE
> ln -sf . $(HOST_DIR)/usr/include/freetype2/freetype
> endef
> --
> 2.0.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2014-07-03 20:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-03 20:19 [Buildroot] [PATCH] freetype: fix double installation Thomas Petazzoni
2014-07-03 20:26 ` Yann E. MORIN [this message]
2014-07-03 21:36 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140703202623.GA23331@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox