Packages: X11/util-macros: convert to use generic macros

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

2 files changed, 19 insertions, 55 deletions

diff --git a/packages/x11/utilmacros/utilmacros.kconfig b/packages/x11/utilmacros/utilmacros.kconfig
index 28c3209..9e3854c 100644
--- a/packages/x11/utilmacros/utilmacros.kconfig
+++ b/packages/x11/utilmacros/utilmacros.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_UTILMACROS
 	bool "Have utilmacros"
+	select EMBTK_UTILMACROS_PKG_IS_TARBZ2
 	help
 		util-macros for X windowing system.
 		This is a set of autoconf macros used by the configure.ac
@@ -66,3 +67,11 @@ config EMBTK_UTILMACROS_VERSION_STRING
 	default "1.6.1"		if EMBTK_UTILMACROS_VERSION_1_6_1
 	default "1.6.0"		if EMBTK_UTILMACROS_VERSION_1_6_0
 
+config EMBTK_UTILMACROS_NEED_PATCH
+	bool
+config EMBTK_UTILMACROS_NEED_AUTORECONF
+	bool
+config EMBTK_UTILMACROS_PKG_IS_TARGZ
+	bool
+config EMBTK_UTILMACROS_PKG_IS_TARBZ2
+	bool
diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk
index 08120fd..83d3384 100644
--- a/packages/x11/utilmacros/utilmacros.mk
+++ b/packages/x11/utilmacros/utilmacros.mk
@@ -23,9 +23,13 @@
 # \date         March 2010
 ################################################################################
 
-UTILMACROS_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_UTILMACROS_VERSION_STRING)))
+UTILMACROS_NAME := util-macro
+UTILMACROS_VERSION := $(call EMBTK_GET_PKG_VERSION,UTILMACROS)
 UTILMACROS_SITE := http://xorg.freedesktop.org/archive/individual/util
+UTILMACROS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+UTILMACROS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/util-macro/$(UTILMACROS_VERSION)
 UTILMACROS_PACKAGE := util-macros-$(UTILMACROS_VERSION).tar.bz2
+UTILMACROS_SRC_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
 UTILMACROS_BUILD_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
 
 UTILMACROS_BINS =
@@ -34,62 +38,13 @@ UTILMACROS_INCLUDES =
 UTILMACROS_LIBS =
 UTILMACROS_PKGCONFIGS = xorg-macros.pc
 
-utilmacros_install:
-	@test -e $(UTILMACROS_BUILD_DIR)/.installed || \
-	$(MAKE) $(UTILMACROS_BUILD_DIR)/.installed
+UTILMACROS_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
-$(UTILMACROS_BUILD_DIR)/.installed: download_utilmacros \
-	$(UTILMACROS_BUILD_DIR)/.decompressed $(UTILMACROS_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	utilmacros-$(UTILMACROS_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(UTILMACROS_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(UTILMACROS_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc $(PKG_CONFIG_PATH)
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+utilmacros_install:
+	$(call EMBTK_INSTALL_PKG,UTILMACROS)
 
 download_utilmacros:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(UTILMACROS_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(UTILMACROS_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(UTILMACROS_PACKAGE) \
-	$(UTILMACROS_SITE)/$(UTILMACROS_PACKAGE)
-
-$(UTILMACROS_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(UTILMACROS_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(UTILMACROS_PACKAGE)
-	@touch $@
-
-$(UTILMACROS_BUILD_DIR)/.configured:
-	$(Q)cd $(UTILMACROS_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)" \
-	CPPFLGAS="-I$(SYSROOT)/usr/include" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \
-	--disable-malloc0returnsnull
-	@touch $@
+	$(call EMBTK_DOWNLOAD_PKG,UTILMACROS)
 
 utilmacros_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup utilmacros-$(UTILMACROS_VERSION)...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(UTILMACROS_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(UTILMACROS_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(UTILMACROS_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(UTILMACROS_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(UTILMACROS_PKGCONFIGS)
-	$(Q)-rm -rf $(UTILMACROS_BUILD_DIR)*
-
+	$(call EMBTK_CLEANUP_PKG,UTILMACROS)