diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-02-07 12:35:06 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-02-08 22:40:49 +0100 |
| commit | 4d3f810aaf43aac7cb29ab6b875206da2a9a15b1 (patch) | |
| tree | a6232b02636a31d2a7931ae97de125dc4c8d0a80 /package/freetype | |
| parent | a5ce8576748421b6dece97a665e575d7dfc9fbe8 (diff) | |
| download | buildroot-novena-4d3f810aaf43aac7cb29ab6b875206da2a9a15b1.tar.gz buildroot-novena-4d3f810aaf43aac7cb29ab6b875206da2a9a15b1.zip | |
package: use <pkg>_CONFIG_SCRIPTS in packages that used special handling
The packages changed by this commit were not only changing prefix= and
exec_prefix= during their <foo>-config fixups, they were also changing
includedir= and/or libdir=. So, they could not be directly converted
to the new <pkg>_CONFIG_SCRIPTS infrastructure.
However, a careful analysis of their default <foo>-config shows that
includedir= and libdir= is defined relatively to either ${prefix} and
${exec_prefix}. Therefore, the manual fixing of includedir= and
libdir= is useless, and fixing prefix= and exec_prefix=, as done by
the <pkg>_CONFIG_SCRIPTS mechanism is sufficient.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/freetype')
| -rw-r--r-- | package/freetype/freetype.mk | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index be0f1a71d..b08bbf7cb 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -14,26 +14,9 @@ FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT FREETYPE_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_BZIP2),bzip2) +FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf -define FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/freetype2\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/bin/freetype-config -endef - -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP - -define FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE - rm -f $(TARGET_DIR)/usr/bin/freetype-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package)) |