Packages: fontconfig: convert to use generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

2 files changed, 32 insertions, 63 deletions

diff --git a/packages/graphics/fontconfig/fontconfig.kconfig b/packages/graphics/fontconfig/fontconfig.kconfig
index 66c4ec5..bd9b073 100644
--- a/packages/graphics/fontconfig/fontconfig.kconfig
+++ b/packages/graphics/fontconfig/fontconfig.kconfig
@@ -24,6 +24,7 @@
 
 config EMBTK_HAVE_FONTCONFIG
 	bool "Have fontconfig"
+	select EMBTK_FONTCONFIG_PKG_IS_TARGZ
 	select EMBTK_HAVE_LIBXML2
 	help
 		Fontconfig is a library for font customization and
@@ -36,9 +37,18 @@ choice
 
 	config  EMBTK_FONTCONFIG_VERSION_2_8_0
 		bool "fontconfig-2.8.0"
+		select EMBTK_FONTCONFIG_NEED_PATCH
 endchoice
 
 config EMBTK_FONTCONFIG_VERSION_STRING
 	string
 	default "2.8.0"		if EMBTK_FONTCONFIG_VERSION_2_8_0
 
+config EMBTK_FONTCONFIG_NEED_PATCH
+	bool
+config EMBTK_FONTCONFIG_NEED_AUTORECONF
+	bool
+config EMBTK_FONTCONFIG_PKG_IS_TARGZ
+	bool
+config EMBTK_FONTCONFIG_PKG_IS_TARBZ2
+	bool
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index 261ff04..f9976ef 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -23,83 +23,42 @@
 # \date         December 2009
 ################################################################################
 
-FONTCONFIG_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_FONTCONFIG_VERSION_STRING)))
-FONTCONFIG_SITE := http://fontconfig.org/release
-FONTCONFIG_PACKAGE := fontconfig-$(FONTCONFIG_VERSION).tar.gz
-FONTCONFIG_BUILD_DIR := $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_NAME		:= fontconfig
+FONTCONFIG_VERSION	:= $(call EMBTK_GET_PKG_VERSION,FONTCONFIG)
+FONTCONFIG_SITE		:= http://fontconfig.org/release
+FONTCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+FONTCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/fontconfig/$(FONTCONFIG_VERSION)
+FONTCONFIG_PACKAGE	:= fontconfig-$(FONTCONFIG_VERSION).tar.gz
+FONTCONFIG_SRC_DIR	:= $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_BUILD_DIR	:= $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
 
-FONTCONFIG_BINS = fc-cache fc-cat fc-list fc-match fc-query fc-scan
-FONTCONFIG_SBINS =
-FONTCONFIG_INCLUDES = fontconfig
-FONTCONFIG_LIBS = libfontconfig*
-FONTCONFIG_PKGCONFIGS = fontconfig.pc
+FONTCONFIG_BINS		= fc-cache fc-cat fc-list fc-match fc-query fc-scan
+FONTCONFIG_SBINS	=
+FONTCONFIG_INCLUDES	= fontconfig
+FONTCONFIG_LIBS		= libfontconfig*
+FONTCONFIG_PKGCONFIGS	= fontconfig.pc
 
+LIBXML2_CFLAGS := -I$(SYSROOT)/usr/include/libxml2
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-LIBXML2_CFLAGS="-I$(SYSROOT)/usr/include/libxml2 -L$(SYSROOT)/usr/lib32"
+LIBXML2_CFLAGS += -L$(SYSROOT)/usr/lib32
 else
-LIBXML2_CFLAGS="-I$(SYSROOT)/usr/include/libxml2 -L$(SYSROOT)/usr/lib"
+LIBXML2_CFLAGS += -L$(SYSROOT)/usr/lib
 endif
 
+FONTCONFIG_CONFIGURE_OPTS := --with-arch=$(STRICT_GNU_TARGET)	\
+			--disable-docs --program-prefix=""
+
 fontconfig_install:
-	@test -e $(FONTCONFIG_BUILD_DIR)/.installed || \
-	$(MAKE) $(FONTCONFIG_BUILD_DIR)/.installed
+	$(call EMBTK_INSTALL_PKG,FONTCONFIG)
 	$(MAKE) $(FONTCONFIG_BUILD_DIR)/.special
 
-$(FONTCONFIG_BUILD_DIR)/.installed: libxml2_install \
-	download_fontconfig $(FONTCONFIG_BUILD_DIR)/.decompressed \
-	$(FONTCONFIG_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	fontconfig-$(FONTCONFIG_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH, $(FONTCONFIG_BUILD_DIR))
-	$(Q)$(MAKE) -C $(FONTCONFIG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(FONTCONFIG_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
 download_fontconfig:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(FONTCONFIG_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(FONTCONFIG_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(FONTCONFIG_PACKAGE) \
-	$(FONTCONFIG_SITE)/$(FONTCONFIG_PACKAGE)
-
-$(FONTCONFIG_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FONTCONFIG_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xzvf $(DOWNLOAD_DIR)/$(FONTCONFIG_PACKAGE)
-	@touch $@
-
-$(FONTCONFIG_BUILD_DIR)/.configured:
-	cd $(FONTCONFIG_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) \
-	CXX=$(TARGETCXX_CACHED) \
-	AR=$(TARGETAR) \
-	RANLIB=$(TARGETRANLIB) \
-	AS=$(CROSS_COMPILE)as \
-	LD=$(TARGETLD) \
-	NM=$(TARGETNM) \
-	STRIP=$(TARGETSTRIP) \
-	OBJDUMP=$(TARGETOBJDUMP) \
-	OBJCOPY=$(TARGETOBJCOPY) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--target=$(STRICT_GNU_TARGET) --with-arch=$(STRICT_GNU_TARGET) \
-	--prefix=/usr --disable-docs --program-prefix="" --libdir=/usr/$(LIBDIR)
-	@touch $@
+	$(call EMBTK_DOWNLOAD_PKG,FONTCONFIG)
 
 .PHONY: $(FONTCONFIG_BUILD_DIR)/.special fontconfig_clean
 
 fontconfig_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup fontconfig...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FONTCONFIG_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FONTCONFIG_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FONTCONFIG_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FONTCONFIG_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FONTCONFIG_PKGCONFIGS)
-	$(Q)-rm -rf $(FONTCONFIG_BUILD_DIR)*
+	$(call EMBTK_CLEANUP_PKG,FONTCONFIG)
 
 $(FONTCONFIG_BUILD_DIR)/.special:
 	$(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/