diff options
| author | Daniel Laird <danieljlaird@hotmail.com> | 2008-11-28 14:20:47 +0000 |
|---|---|---|
| committer | Daniel Laird <danieljlaird@hotmail.com> | 2008-11-28 14:20:47 +0000 |
| commit | 5432f26f0e78fc74a599a596c90a3b8f02963c13 (patch) | |
| tree | a2f18f774cc9afe12770bb3037e4c5b063e1b3fa /package/fontconfig/fontconfig.mk | |
| parent | b277d41ccc8cb46e3b1b01a9d854adeacb2e61fb (diff) | |
| download | buildroot-novena-5432f26f0e78fc74a599a596c90a3b8f02963c13.tar.gz buildroot-novena-5432f26f0e78fc74a599a596c90a3b8f02963c13.zip | |
Adding Central config.cache options
The following changes allow for use of a central configure cache
file. This speeds up configuration of packages.
Its use is configurable at the top level (BR2_CONFIG_CACHE - default n).
Old style makefiles can use it if they use the following MACRO in makefiles:
$(AUTO_CONFIGURE_TARGET) see my change to directfb.mk.
New style Autotools.in will use it if you set the global option.
However you can enable the global option and on a per package overrule it by doing
the following: $(PKGNAME)_USE_CONFIG_CACHE = NO see fontconfig.mk for an example
of this.
Finally I have removed a few config variable settings which indicated no CXX compiler
as this is wrong and breaks the build when using this central cache.
Config.in | 8 ++++++++
package/Makefile.autotools.in | 5 ++++-
package/Makefile.in | 28 +++++++++++++++++++++++++++-
package/atk/atk.mk | 2 +-
package/directfb/directfb.mk | 7 +------
package/fontconfig/fontconfig.mk | 3 +++
package/libglib2/libglib2.mk | 2 +-
package/libgtk2/libgtk2.mk | 1 -
8 files changed, 45 insertions(+), 11 deletions(-)
I would appreciate feedback on this change (I have been testing for 2-3 weeks)
But I can never test all cases! If you enable the BR2_CONFIG_CACHE option some
Makefile.autotools.in based packages may now break - I cannot build them all.
In this case you may need to remove config options that are being hardcoded all
over the place (like gtk saying we have 2 CXX compiler) or disable the use
of CONFIG CACHE file like I have done in fontconfig.
I can build all packages required to get WebKit on DirectFB up and running
and it runs fine.
I will try to resolve any issues this creates as fast as I can.
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Diffstat (limited to 'package/fontconfig/fontconfig.mk')
| -rw-r--r-- | package/fontconfig/fontconfig.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 8e5577aa8..06872c45a 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -7,8 +7,11 @@ FONTCONFIG_VERSION = 2.6.0 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.gz FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_AUTORECONF = YES +FONTCONFIG_USE_CONFIG_CACHE = NO FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_INSTALL_TARGET = YES +# This package does not like using the target cflags for some reason. +FONTCONFIG_CONF_ENV = CFLAGS= FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \ --with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \ |