diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-30 21:07:33 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-30 21:07:33 +0200 |
| commit | fc9e73f1e87c6e55223158c5d2e2fe8f9d3c2ce5 (patch) | |
| tree | f0f854815e87328a3f8c749210b2f793d0eaf602 | |
| parent | dc8ad05cccf64348b9235bd6aabed302b12ae3ab (diff) | |
| download | embtoolkit-fc9e73f1e87c6e55223158c5d2e2fe8f9d3c2ce5.tar.gz embtoolkit-fc9e73f1e87c6e55223158c5d2e2fe8f9d3c2ce5.tar.bz2 embtoolkit-fc9e73f1e87c6e55223158c5d2e2fe8f9d3c2ce5.tar.xz | |
Packages: convert more (almost all) packages to generic macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
34 files changed, 317 insertions, 1025 deletions
diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk index 4b4973f..44cd6d9 100644 --- a/packages/busybox/busybox.mk +++ b/packages/busybox/busybox.mk @@ -23,14 +23,13 @@ # \date May 2009 ################################################################################ -BB_NAME := busybox -BB_VERSION := $(call embtk_get_pkgversion,BB) -BB_SITE := http://www.busybox.net/downloads -BB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -BB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/busybox/$(BB_VERSION) -BB_PACKAGE := busybox-$(BB_VERSION).tar.bz2 -BB_SRC_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) -BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) +BB_NAME := busybox +BB_VERSION := $(call embtk_get_pkgversion,bb) +BB_SITE := http://www.busybox.net/downloads +BB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +BB_PACKAGE := busybox-$(BB_VERSION).tar.bz2 +BB_SRC_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) +BB_BUILD_DIR := $(PACKAGES_BUILD)/busybox-$(BB_VERSION) busybox_install: $(BB_BUILD_DIR)/.installed @@ -41,17 +40,17 @@ $(BB_BUILD_DIR)/.installed: download_busybox $(BB_BUILD_DIR)/.decompressed \ $(Q)$(MAKE) -C $(BB_BUILD_DIR) \ CROSS_COMPILE="$(CCACHE_HOST_DIR)/bin/ccache $(TOOLS)/bin/$(STRICT_GNU_TARGET)-" \ CONFIG_PREFIX=$(ROOTFS) oldconfig - @CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" \ + $(Q)CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing" \ $(MAKE) -C $(BB_BUILD_DIR) \ CROSS_COMPILE="$(CCACHE_HOST_DIR)/bin/ccache $(TOOLS)/bin/$(STRICT_GNU_TARGET)-" \ CONFIG_PREFIX=$(ROOTFS) install - @touch $@ + $(Q)touch $@ download_busybox: - $(call embtk_download_pkg,BB) + $(call embtk_download_pkg,bb) $(BB_BUILD_DIR)/.decompressed: - $(call embtk_decompress_pkg,BB) + $(call embtk_decompress_pkg,bb) $(BB_BUILD_DIR)/.configured: $(call embtk_generic_message,"Configuring busybox...") diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index 4baa010..9e864fd 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -24,10 +24,9 @@ ################################################################################ ZLIB_NAME := zlib -ZLIB_VERSION := $(call embtk_get_pkgversion,ZLIB) +ZLIB_VERSION := $(call embtk_get_pkgversion,zlib) ZLIB_SITE := http://zlib.net ZLIB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -ZLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/$(ZLIB_VERSION) ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2 ZLIB_SRC_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) ZLIB_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) @@ -48,7 +47,7 @@ ZLIB_CONFIGURE_OPTS := $(ZLIB_LINUX_ARCH) --enable-shared zlib_install: - @test -e $(ZLIB_BUILD_DIR)/.installed || \ + $(Q)test -e $(ZLIB_BUILD_DIR)/.installed || \ $(MAKE) $(ZLIB_BUILD_DIR)/.installed $(ZLIB_BUILD_DIR)/.installed: download_zlib \ @@ -56,15 +55,15 @@ $(ZLIB_BUILD_DIR)/.installed: download_zlib \ $(ZLIB_BUILD_DIR)/.configured $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install - @touch $@ + $(Q)touch $@ $(ZLIB_SRC_DIR)/.decompressed: - $(call embtk_decompress_pkg,ZLIB) + $(call embtk_decompress_pkg,zlib) $(ZLIB_BUILD_DIR)/.configured: $(call embtk_generic_msg,"Configure $(ZLIB_PACKAGE)...") $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_CONFIGURE_OPTS)") - @cd $(ZLIB_BUILD_DIR); \ + $(Q)cd $(ZLIB_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ CXX=$(TARGETCXX_CACHED) \ AR=$(TARGETAR) \ @@ -80,7 +79,7 @@ $(ZLIB_BUILD_DIR)/.configured: LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ CPPFLAGS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ - PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ + PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ $(ZLIB_CONFIGURE_ENV) \ $(CONFIG_SHELL) $(ZLIB_SRC_DIR)/configure \ --libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \ @@ -88,7 +87,7 @@ $(ZLIB_BUILD_DIR)/.configured: @touch $@ zlib_clean: - $(call embtk_cleanup_pkg,ZLIB) + $(call embtk_cleanup_pkg,zlib) ######################## # zlib on host machine # @@ -99,7 +98,6 @@ ZLIB_HOST_SITE := $(ZLIB_SITE) ZLIB_HOST_SITE_MIRROR1 := $(ZLIB_SITE_MIRROR1) ZLIB_HOST_SITE_MIRROR2 := $(ZLIB_SITE_MIRROR2) ZLIB_HOST_SITE_MIRROR3 := $(ZLIB_SITE_MIRROR3) -ZLIB_HOST_PATCH_SITE := $(ZLIB_PATCH_SITE) ZLIB_HOST_PACKAGE := $(ZLIB_PACKAGE) ZLIB_HOST_SRC_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) @@ -107,7 +105,7 @@ ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) ZLIB_HOST_CONFIGURE_ENV := CC=$(HOSTCC_CACHED) zlib_host_install: - @test -e $(ZLIB_HOST_BUILD_DIR)/.installed || \ + $(Q)test -e $(ZLIB_HOST_BUILD_DIR)/.installed || \ $(MAKE) $(ZLIB_HOST_BUILD_DIR)/.installed $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \ @@ -115,21 +113,21 @@ $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \ $(ZLIB_HOST_BUILD_DIR)/.configured $(Q)$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) install - @touch $@ + $(Q)touch $@ $(ZLIB_HOST_SRC_DIR)/.decompressed: - $(call embtk_decompress_pkg,ZLIB_HOST) + $(call embtk_decompress_pkg,zlib_host) $(ZLIB_HOST_BUILD_DIR)/.configured: $(call embtk_generic_msg,"Configure $(ZLIB_HOST_PACKAGE) for host...") $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_HOST_CONFIGURE_OPTS)") - @cd $(ZLIB_HOST_BUILD_DIR); \ + $(Q)cd $(ZLIB_HOST_BUILD_DIR); \ CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \ LDFLAGS="-L$(HOSTTOOLS)/$(LIBDIR) -L$(HOSTTOOLS)/usr/$(LIBDIR)" \ $(ZLIB_HOST_CONFIGURE_ENV) \ $(CONFIG_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \ --prefix=$(HOSTTOOLS)/usr $(ZLIB_HOST_CONFIGURE_OPTS) - @touch $@ + $(Q)touch $@ zlib_host_clean: @@ -139,4 +137,4 @@ zlib_host_clean: #zlib download download_zlib download_zlib_host: - $(call embtk_download_pkg,ZLIB) + $(call embtk_download_pkg,zlib) diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk index 130891e..75ed51c 100644 --- a/packages/development/gdb/gdb.mk +++ b/packages/development/gdb/gdb.mk @@ -27,7 +27,6 @@ GDB_NAME := gdb GDB_VERSION := $(call embtk_get_pkgversion,gdb) GDB_SITE := http://ftp.gnu.org/gnu/gdb GDB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -GDB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/gdb/$(GDB_VERSION) GDB_PACKAGE := gdb-$(GDB_VERSION).tar.bz2 GDB_SRC_DIR := $(PACKAGES_BUILD)/gdb-$(GDB_VERSION) GDB_BUILD_DIR := $(if $(CONFIG_EMBTK_HAVE_GDBSERVER), \ diff --git a/packages/development/libevent/libevent.mk b/packages/development/libevent/libevent.mk index 51e53bf..5ee8ca3 100644 --- a/packages/development/libevent/libevent.mk +++ b/packages/development/libevent/libevent.mk @@ -24,7 +24,7 @@ ################################################################################ LIBEVENT_NAME := libevent -LIBEVENT_VERSION := $(call embtk_get_pkgversion,LIBEVENT) +LIBEVENT_VERSION := $(call embtk_get_pkgversion,libevent) LIBEVENT_SITE := http://www.monkey.org/~provos LIBEVENT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror LIBEVENT_PACKAGE := libevent-$(LIBEVENT_VERSION).tar.gz diff --git a/packages/x11/compositeproto/compositeproto.kconfig b/packages/x11/compositeproto/compositeproto.kconfig index e570400..1659188 100644 --- a/packages/x11/compositeproto/compositeproto.kconfig +++ b/packages/x11/compositeproto/compositeproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_COMPOSITEPROTO bool "Have compositeproto" + select EMBTK_COMPOSITEPROTO_PKG_IS_TARBZ2 help compositeproto for X windowing system choice @@ -45,3 +46,11 @@ config EMBTK_COMPOSITEPROTO_VERSION_STRING default "0.4.2" if EMBTK_COMPOSITEPROTO_VERSION_0_4_2 default "0.4.1" if EMBTK_COMPOSITEPROTO_VERSION_0_4_1 +config EMBTK_COMPOSITEPROTO_NEED_PATCH + bool +config EMBTK_COMPOSITEPROTO_NEED_AUTORECONF + bool +config EMBTK_COMPOSITEPROTO_PKG_IS_TARGZ + bool +config EMBTK_COMPOSITEPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/compositeproto/compositeproto.mk b/packages/x11/compositeproto/compositeproto.mk index 72d4558..d5c91a5 100644 --- a/packages/x11/compositeproto/compositeproto.mk +++ b/packages/x11/compositeproto/compositeproto.mk @@ -23,73 +23,16 @@ # \date March 2010 ################################################################################ -COMPOSITEPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_COMPOSITEPROTO_VERSION_STRING))) -COMPOSITEPROTO_SITE := http://ftp.x.org/pub/individual/proto -COMPOSITEPROTO_PACKAGE := compositeproto-$(COMPOSITEPROTO_VERSION).tar.bz2 -COMPOSITEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/compositeproto-$(COMPOSITEPROTO_VERSION) - -COMPOSITEPROTO_BINS = -COMPOSITEPROTO_SBINS = -COMPOSITEPROTO_INCLUDES = X11/extensions/compositeproto.h \ - X11/extensions/composite.h -COMPOSITEPROTO_LIBS = -COMPOSITEPROTO_PKGCONFIGS = compositeproto.pc - -compositeproto_install: - @test -e $(COMPOSITEPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(COMPOSITEPROTO_BUILD_DIR)/.installed - -$(COMPOSITEPROTO_BUILD_DIR)/.installed: download_compositeproto \ - $(COMPOSITEPROTO_BUILD_DIR)/.decompressed $(COMPOSITEPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - compositeproto-$(COMPOSITEPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(COMPOSITEPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(COMPOSITEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_compositeproto: - $(call embtk_generic_message,"Downloading $(COMPOSITEPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE) \ - $(COMPOSITEPROTO_SITE)/$(COMPOSITEPROTO_PACKAGE) - -$(COMPOSITEPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(COMPOSITEPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(COMPOSITEPROTO_PACKAGE) - @touch $@ - -$(COMPOSITEPROTO_BUILD_DIR)/.configured: - $(Q)cd $(COMPOSITEPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \ - --disable-malloc0returnsnull - @touch $@ - -compositeproto_clean: - $(call embtk_generic_message,"cleanup compositeproto-$(COMPOSITEPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(COMPOSITEPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(COMPOSITEPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(COMPOSITEPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(COMPOSITEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(COMPOSITEPROTO_PKGCONFIGS) - $(Q)-rm -rf $(COMPOSITEPROTO_BUILD_DIR)* - +COMPOSITEPROTO_NAME := compositeproto +COMPOSITEPROTO_VERSION := $(call embtk_get_pkgversion,compositeproto) +COMPOSITEPROTO_SITE := http://ftp.x.org/pub/individual/proto +COMPOSITEPROTO_PACKAGE := compositeproto-$(COMPOSITEPROTO_VERSION).tar.bz2 +COMPOSITEPROTO_SRC_DIR := $(PACKAGES_BUILD)/compositeproto-$(COMPOSITEPROTO_VERSION) +COMPOSITEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/compositeproto-$(COMPOSITEPROTO_VERSION) + +COMPOSITEPROTO_BINS = +COMPOSITEPROTO_SBINS = +COMPOSITEPROTO_INCLUDES = X11/extensions/compositeproto.h \ + X11/extensions/composite.h +COMPOSITEPROTO_LIBS = +COMPOSITEPROTO_PKGCONFIGS = compositeproto.pc diff --git a/packages/x11/damageproto/damageproto.kconfig b/packages/x11/damageproto/damageproto.kconfig index 594aaa9..1146739 100644 --- a/packages/x11/damageproto/damageproto.kconfig +++ b/packages/x11/damageproto/damageproto.kconfig @@ -24,6 +24,7 @@ config EMBTK_HAVE_DAMAGEPROTO bool "Have damageproto" + select EMBTK_DAMAGEPROTO_PKG_IS_TARBZ2 help damageproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_DAMAGEPROTO_VERSION_STRING default "1.2.1" if EMBTK_DAMAGEPROTO_VERSION_1_2_1 default "1.2.0" if EMBTK_DAMAGEPROTO_VERSION_1_2_0 +config EMBTK_DAMAGEPROTO_NEED_PATCH + bool +config EMBTK_DAMAGEPROTO_NEED_AUTORECONF + bool +config EMBTK_DAMAGEPROTO_PKG_IS_TARGZ + bool +config EMBTK_DAMAGEPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/damageproto/damageproto.mk b/packages/x11/damageproto/damageproto.mk index 42b3100..c571226 100644 --- a/packages/x11/damageproto/damageproto.mk +++ b/packages/x11/damageproto/damageproto.mk @@ -23,10 +23,12 @@ # \date December 2009 ################################################################################ -DAMAGEPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_DAMAGEPROTO_VERSION_STRING))) -DAMAGEPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -DAMAGEPROTO_PACKAGE := damageproto-$(DAMAGEPROTO_VERSION).tar.bz2 -DAMAGEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/damageproto-$(DAMAGEPROTO_VERSION) +DAMAGEPROTO_NAME := damageproto +DAMAGEPROTO_VERSION := $(call embtk_get_pkgversion,damageproto) +DAMAGEPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +DAMAGEPROTO_PACKAGE := damageproto-$(DAMAGEPROTO_VERSION).tar.bz2 +DAMAGEPROTO_SRC_DIR := $(PACKAGES_BUILD)/damageproto-$(DAMAGEPROTO_VERSION) +DAMAGEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/damageproto-$(DAMAGEPROTO_VERSION) DAMAGEPROTO_BINS = DAMAGEPROTO_SBINS = @@ -34,61 +36,3 @@ DAMAGEPROTO_INCLUDES = X11/extnsions/damageproto.h damagewire.h DAMAGEPROTO_LIBS = DAMAGEPROTO_PKGCONFIGS = damageproto.pc -damageproto_install: - @test -e $(DAMAGEPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(DAMAGEPROTO_BUILD_DIR)/.installed - -$(DAMAGEPROTO_BUILD_DIR)/.installed: download_damageproto \ - $(DAMAGEPROTO_BUILD_DIR)/.decompressed $(DAMAGEPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - damageproto-$(DAMAGEPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(DAMAGEPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(DAMAGEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_damageproto: - $(call embtk_generic_message,"Downloading $(DAMAGEPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE) \ - $(DAMAGEPROTO_SITE)/$(DAMAGEPROTO_PACKAGE) - -$(DAMAGEPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(DAMAGEPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(DAMAGEPROTO_PACKAGE) - @touch $@ - -$(DAMAGEPROTO_BUILD_DIR)/.configured: - $(Q)cd $(DAMAGEPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -damageproto_clean: - $(call embtk_generic_message,"cleanup damageproto-$(DAMAGEPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DAMAGEPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DAMAGEPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DAMAGEPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(DAMAGEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(DAMAGEPROTO_PKGCONFIGS) - $(Q)-rm -rf $(DAMAGEPROTO_BUILD_DIR)* - diff --git a/packages/x11/fixesproto/fixesproto.kconfig b/packages/x11/fixesproto/fixesproto.kconfig index e777d50..efd7442 100644 --- a/packages/x11/fixesproto/fixesproto.kconfig +++ b/packages/x11/fixesproto/fixesproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_FIXESPROTO bool "Have fixesproto" + select EMBTK_FIXESPROTO_PKG_IS_TARBZ2 help fixesproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_FIXESPROTO_VERSION_STRING default "4.1.2" if EMBTK_FIXESPROTO_VERSION_4_1_2 default "4.1" if EMBTK_FIXESPROTO_VERSION_4_1 +config EMBTK_FIXESPROTO_NEED_PATCH + bool +config EMBTK_FIXESPROTO_NEED_AUTORECONF + bool +config EMBTK_FIXESPROTO_PKG_IS_TARGZ + bool +config EMBTK_FIXESPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/fixesproto/fixesproto.mk b/packages/x11/fixesproto/fixesproto.mk index 5bf0a84..89fc023 100644 --- a/packages/x11/fixesproto/fixesproto.mk +++ b/packages/x11/fixesproto/fixesproto.mk @@ -23,72 +23,16 @@ # \date February 2010 ################################################################################ -FIXESPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_FIXESPROTO_VERSION_STRING))) -FIXESPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -FIXESPROTO_PACKAGE := fixesproto-$(FIXESPROTO_VERSION).tar.bz2 -FIXESPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fixesproto-$(FIXESPROTO_VERSION) - -FIXESPROTO_BINS = -FIXESPROTO_SBINS = -FIXESPROTO_INCLUDES = X11/extensions/xfixesproto.h X11/extensions/xfixeswire.h -FIXESPROTO_LIBS = -FIXESPROTO_PKGCONFIGS = fixesproto.pc - -fixesproto_install: - @test -e $(FIXESPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(FIXESPROTO_BUILD_DIR)/.installed - -$(FIXESPROTO_BUILD_DIR)/.installed: download_fixesproto \ - $(FIXESPROTO_BUILD_DIR)/.decompressed $(FIXESPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - fixesproto-$(FIXESPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(FIXESPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(FIXESPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_fixesproto: - $(call embtk_generic_message,"Downloading $(FIXESPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE) \ - $(FIXESPROTO_SITE)/$(FIXESPROTO_PACKAGE) - -$(FIXESPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(FIXESPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(FIXESPROTO_PACKAGE) - @touch $@ - -$(FIXESPROTO_BUILD_DIR)/.configured: - $(Q)cd $(FIXESPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -fixesproto_clean: - $(call embtk_generic_message,"cleanup fixesproto-$(FIXESPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FIXESPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FIXESPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FIXESPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FIXESPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FIXESPROTO_PKGCONFIGS) - $(Q)-rm -rf $(FIXESPROTO_BUILD_DIR)* +FIXESPROTO_NAME := fixesproto +FIXESPROTO_VERSION := $(call embtk_get_pkgversion,fixesproto) +FIXESPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +FIXESPROTO_PACKAGE := fixesproto-$(FIXESPROTO_VERSION).tar.bz2 +FIXESPROTO_SRC_DIR := $(PACKAGES_BUILD)/fixesproto-$(FIXESPROTO_VERSION) +FIXESPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fixesproto-$(FIXESPROTO_VERSION) + +FIXESPROTO_BINS = +FIXESPROTO_SBINS = +FIXESPROTO_INCLUDES = X11/extensions/xfixesproto.h X11/extensions/xfixeswire.h +FIXESPROTO_LIBS = +FIXESPROTO_PKGCONFIGS = fixesproto.pc diff --git a/packages/x11/fontsproto/fontsproto.kconfig b/packages/x11/fontsproto/fontsproto.kconfig index b4b70f0..9d42af4 100644 --- a/packages/x11/fontsproto/fontsproto.kconfig +++ b/packages/x11/fontsproto/fontsproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_FONTSPROTO bool "Have fontsproto" + select EMBTK_FONTSPROTO_PKG_IS_TARBZ2 help fontsproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_FONTSPROTO_VERSION_STRING default "2.1.1" if EMBTK_FONTSPROTO_VERSION_2_1_1 default "2.1.0" if EMBTK_FONTSPROTO_VERSION_2_1_0 +config EMBTK_FONTSPROTO_NEED_PATCH + bool +config EMBTK_FONTSPROTO_NEED_AUTORECONF + bool +config EMBTK_FONTSPROTO_PKG_IS_TARGZ + bool +config EMBTK_FONTSPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/fontsproto/fontsproto.mk b/packages/x11/fontsproto/fontsproto.mk index 18fdf66..a6d7b9e 100644 --- a/packages/x11/fontsproto/fontsproto.mk +++ b/packages/x11/fontsproto/fontsproto.mk @@ -23,74 +23,18 @@ # \date February 2010 ################################################################################ -FONTSPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_FONTSPROTO_VERSION_STRING))) -FONTSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -FONTSPROTO_PACKAGE := fontsproto-$(FONTSPROTO_VERSION).tar.bz2 -FONTSPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fontsproto-$(FONTSPROTO_VERSION) - -FONTSPROTO_BINS = -FONTSPROTO_SBINS = -FONTSPROTO_INCLUDES = X11/fonts/font.h X11/fonts/fontproto.h \ - X11/fonts/fontstruct.h X11/fonts/FS.h X11/fonts/fsmasks.h \ - X11/fonts/FSproto.h -FONTSPROTO_LIBS = -FONTSPROTO_PKGCONFIGS = fontsproto.pc - -fontsproto_install: - @test -e $(FONTSPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(FONTSPROTO_BUILD_DIR)/.installed - -$(FONTSPROTO_BUILD_DIR)/.installed: download_fontsproto \ - $(FONTSPROTO_BUILD_DIR)/.decompressed $(FONTSPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - fontsproto-$(FONTSPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(FONTSPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(FONTSPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_fontsproto: - $(call embtk_generic_message,"Downloading $(FONTSPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE) \ - $(FONTSPROTO_SITE)/$(FONTSPROTO_PACKAGE) - -$(FONTSPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(FONTSPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(FONTSPROTO_PACKAGE) - @touch $@ - -$(FONTSPROTO_BUILD_DIR)/.configured: - $(Q)cd $(FONTSPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -fontsproto_clean: - $(call embtk_generic_message,"cleanup fontsproto...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FONTSPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FONTSPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FONTSPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FONTSPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FONTSPROTO_PKGCONFIGS) - $(Q)-rm -rf $(FONTSPROTO_BUILD_DIR)* +FONTSPROTO_NAME := fontsproto +FONTSPROTO_VERSION := $(call embtk_get_pkgversion,fontsproto) +FONTSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +FONTSPROTO_PACKAGE := fontsproto-$(FONTSPROTO_VERSION).tar.bz2 +FONTSPROTO_SRC_DIR := $(PACKAGES_BUILD)/fontsproto-$(FONTSPROTO_VERSION) +FONTSPROTO_BUILD_DIR := $(PACKAGES_BUILD)/fontsproto-$(FONTSPROTO_VERSION) + +FONTSPROTO_BINS = +FONTSPROTO_SBINS = +FONTSPROTO_INCLUDES = X11/fonts/font.h X11/fonts/fontproto.h \ + X11/fonts/fontstruct.h X11/fonts/FS.h \ + X11/fonts/fsmasks.h X11/fonts/FSproto.h +FONTSPROTO_LIBS = +FONTSPROTO_PKGCONFIGS = fontsproto.pc diff --git a/packages/x11/inputproto/inputproto.kconfig b/packages/x11/inputproto/inputproto.kconfig index 5b4c43a..cd45e17 100644 --- a/packages/x11/inputproto/inputproto.kconfig +++ b/packages/x11/inputproto/inputproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_INPUTPROTO bool "Have inputproto" + select EMBTK_INPUTPROTO_PKG_IS_TARBZ2 help inputproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_INPUTPROTO_VERSION_STRING default "2.0.1" if EMBTK_INPUTPROTO_VERSION_2_0_1 default "2.0" if EMBTK_INPUTPROTO_VERSION_2_0 +config EMBTK_INPUTPROTO_NEED_PATCH + bool +config EMBTK_INPUTPROTO_NEED_AUTORECONF + bool +config EMBTK_INPUTPROTO_PKG_IS_TARGZ + bool +config EMBTK_INPUTPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/inputproto/inputproto.mk b/packages/x11/inputproto/inputproto.mk index dd86196..0607690 100644 --- a/packages/x11/inputproto/inputproto.mk +++ b/packages/x11/inputproto/inputproto.mk @@ -23,73 +23,17 @@ # \date February 2010 ################################################################################ -INPUTPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_INPUTPROTO_VERSION_STRING))) -INPUTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -INPUTPROTO_PACKAGE := inputproto-$(INPUTPROTO_VERSION).tar.bz2 -INPUTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/inputproto-$(INPUTPROTO_VERSION) - -INPUTPROTO_BINS = -INPUTPROTO_SBINS = -INPUTPROTO_INCLUDES = X11/extensions/XI2.h X11/extensions/XI2proto.h \ - X11/extensions/XI.h X11/extensions/XIproto.h -INPUTPROTO_LIBS = -INPUTPROTO_PKGCONFIGS = inputproto.pc - -inputproto_install: - @test -e $(INPUTPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(INPUTPROTO_BUILD_DIR)/.installed - -$(INPUTPROTO_BUILD_DIR)/.installed: download_inputproto \ - $(INPUTPROTO_BUILD_DIR)/.decompressed $(INPUTPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - inputproto-$(INPUTPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(INPUTPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(INPUTPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_inputproto: - $(call embtk_generic_message,"Downloading $(INPUTPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE) \ - $(INPUTPROTO_SITE)/$(INPUTPROTO_PACKAGE) - -$(INPUTPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(INPUTPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(INPUTPROTO_PACKAGE) - @touch $@ - -$(INPUTPROTO_BUILD_DIR)/.configured: - $(Q)cd $(INPUTPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -inputproto_clean: - $(call embtk_generic_message,"cleanup inputproto-$(INPUTPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(INPUTPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(INPUTPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(INPUTPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(INPUTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(INPUTPROTO_PKGCONFIGS) - $(Q)-rm -rf $(INPUTPROTO_BUILD_DIR)* +INPUTPROTO_NAME := inputproto +INPUTPROTO_VERSION := $(call embtk_get_pkgversion,inputproto) +INPUTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +INPUTPROTO_PACKAGE := inputproto-$(INPUTPROTO_VERSION).tar.bz2 +INPUTPROTO_SRC_DIR := $(PACKAGES_BUILD)/inputproto-$(INPUTPROTO_VERSION) +INPUTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/inputproto-$(INPUTPROTO_VERSION) + +INPUTPROTO_BINS = +INPUTPROTO_SBINS = +INPUTPROTO_INCLUDES = X11/extensions/XI2.h X11/extensions/XI2proto.h \ + X11/extensions/XI.h X11/extensions/XIproto.h +INPUTPROTO_LIBS = +INPUTPROTO_PKGCONFIGS = inputproto.pc diff --git a/packages/x11/kbproto/kbproto.kconfig b/packages/x11/kbproto/kbproto.kconfig index e8db9c7..eb1a3dc 100644 --- a/packages/x11/kbproto/kbproto.kconfig +++ b/packages/x11/kbproto/kbproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_KBPROTO bool "Have kbproto" + select EMBTK_KBPROTO_PKG_IS_TARBZ2 help kbproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_KBPROTO_VERSION_STRING default "1.0.5" if EMBTK_KBPROTO_VERSION_1_0_5 default "1.0.4" if EMBTK_KBPROTO_VERSION_1_0_4 +config EMBTK_KBPROTO_NEED_PATCH + bool +config EMBTK_KBPROTO_NEED_AUTORECONF + bool +config EMBTK_KBPROTO_PKG_IS_TARGZ + bool +config EMBTK_KBPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk index 51ca611..adc07b2 100644 --- a/packages/x11/kbproto/kbproto.mk +++ b/packages/x11/kbproto/kbproto.mk @@ -23,74 +23,18 @@ # \date February 2010 ################################################################################ -KBPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_KBPROTO_VERSION_STRING))) -KBPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -KBPROTO_PACKAGE := kbproto-$(KBPROTO_VERSION).tar.bz2 -KBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION) - -KBPROTO_BINS = -KBPROTO_SBINS = -KBPROTO_INCLUDES = X11/extensions/XKBgeom.h X11/extensions/XKB.h \ - X11/extensions/XKBproto.h X11/extensions/XKBsrv.h \ - X11/extensions/XKBstr.h -KBPROTO_LIBS = -KBPROTO_PKGCONFIGS = kbproto.pc - -kbproto_install: - @test -e $(KBPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(KBPROTO_BUILD_DIR)/.installed - -$(KBPROTO_BUILD_DIR)/.installed: download_kbproto \ - $(KBPROTO_BUILD_DIR)/.decompressed $(KBPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - kbproto-$(KBPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(KBPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_kbproto: - $(call embtk_generic_message,"Downloading $(KBPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) \ - $(KBPROTO_SITE)/$(KBPROTO_PACKAGE) - -$(KBPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(KBPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(KBPROTO_PACKAGE) - @touch $@ - -$(KBPROTO_BUILD_DIR)/.configured: - $(Q)cd $(KBPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -kbproto_clean: - $(call embtk_generic_message,"cleanup kbproto...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(KBPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(KBPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(KBPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(KBPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(KBPROTO_PKGCONFIGS) - $(Q)-rm -rf $(KBPROTO_BUILD_DIR)* +KBPROTO_NAME := kbproto +KBPROTO_VERSION := $(call embtk_get_pkgversion,kbproto) +KBPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +KBPROTO_PACKAGE := kbproto-$(KBPROTO_VERSION).tar.bz2 +KBPROTO_SRC_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION) +KBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/kbproto-$(KBPROTO_VERSION) + +KBPROTO_BINS = +KBPROTO_SBINS = +KBPROTO_INCLUDES = X11/extensions/XKBgeom.h X11/extensions/XKB.h \ + X11/extensions/XKBproto.h X11/extensions/XKBsrv.h \ + X11/extensions/XKBstr.h +KBPROTO_LIBS = +KBPROTO_PKGCONFIGS = kbproto.pc diff --git a/packages/x11/randrproto/randrproto.kconfig b/packages/x11/randrproto/randrproto.kconfig index 0c5e688..c9186ae 100644 --- a/packages/x11/randrproto/randrproto.kconfig +++ b/packages/x11/randrproto/randrproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_RANDRPROTO bool "Have randrproto" + select EMBTK_RANDRPROTO_PKG_IS_TARBZ2 help randrproto for X windowing system. This extension defines a protocol for clients to dynamically @@ -48,3 +49,11 @@ config EMBTK_RANDRPROTO_VERSION_STRING default "1.3.2" if EMBTK_RANDRPROTO_VERSION_1_3_2 default "1.3.1" if EMBTK_RANDRPROTO_VERSION_1_3_1 +config EMBTK_RANDRPROTO_NEED_PATCH + bool +config EMBTK_RANDRPROTO_NEED_AUTORECONF + bool +config EMBTK_RANDRPROTO_PKG_IS_TARGZ + bool +config EMBTK_RANDRPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/randrproto/randrproto.mk b/packages/x11/randrproto/randrproto.mk index fe542fb..c9cb860 100644 --- a/packages/x11/randrproto/randrproto.mk +++ b/packages/x11/randrproto/randrproto.mk @@ -23,10 +23,12 @@ # \date February 2010 ################################################################################ -RANDRPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_RANDRPROTO_VERSION_STRING))) -RANDRPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -RANDRPROTO_PACKAGE := randrproto-$(RANDRPROTO_VERSION).tar.bz2 -RANDRPROTO_BUILD_DIR := $(PACKAGES_BUILD)/randrproto-$(RANDRPROTO_VERSION) +RANDRPROTO_NAME := randrproto +RANDRPROTO_VERSION := $(call embtk_get_pkgversion,randrproto) +RANDRPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +RANDRPROTO_PACKAGE := randrproto-$(RANDRPROTO_VERSION).tar.bz2 +RANDRPROTO_SRC_DIR := $(PACKAGES_BUILD)/randrproto-$(RANDRPROTO_VERSION) +RANDRPROTO_BUILD_DIR := $(PACKAGES_BUILD)/randrproto-$(RANDRPROTO_VERSION) RANDRPROTO_BINS = RANDRPROTO_SBINS = @@ -34,61 +36,3 @@ RANDRPROTO_INCLUDES = X11/extensions/randr.h X11/extensions/randrproto.h RANDRPROTO_LIBS = RANDRPROTO_PKGCONFIGS = randrproto.pc -randrproto_install: - @test -e $(RANDRPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(RANDRPROTO_BUILD_DIR)/.installed - -$(RANDRPROTO_BUILD_DIR)/.installed: download_randrproto \ - $(RANDRPROTO_BUILD_DIR)/.decompressed $(RANDRPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - randrproto-$(RANDRPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(RANDRPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(RANDRPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_randrproto: - $(call embtk_generic_message,"Downloading $(RANDRPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE) \ - $(RANDRPROTO_SITE)/$(RANDRPROTO_PACKAGE) - -$(RANDRPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(RANDRPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RANDRPROTO_PACKAGE) - @touch $@ - -$(RANDRPROTO_BUILD_DIR)/.configured: - $(Q)cd $(RANDRPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -randrproto_clean: - $(call embtk_generic_message,"cleanup randrproto-$(RANDRPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RANDRPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RANDRPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RANDRPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RANDRPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RANDRPROTO_PKGCONFIGS) - $(Q)-rm -rf $(RANDRPROTO_BUILD_DIR)* - diff --git a/packages/x11/recordproto/recordproto.kconfig b/packages/x11/recordproto/recordproto.kconfig index d283aff..bcf6bb3 100644 --- a/packages/x11/recordproto/recordproto.kconfig +++ b/packages/x11/recordproto/recordproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_RECORDPROTO bool "Have recordproto" + select EMBTK_RECORDPROTO_PKG_IS_TARBZ2 help recordproto for X windowing system. This extension defines a protocol for the recording and playback @@ -48,3 +49,11 @@ config EMBTK_RECORDPROTO_VERSION_STRING default "1.14.1" if EMBTK_RECORDPROTO_VERSION_1_14_1 default "1.14" if EMBTK_RECORDPROTO_VERSION_1_14 +config EMBTK_RECORDPROTO_NEED_PATCH + bool +config EMBTK_RECORDPROTO_NEED_AUTORECONF + bool +config EMBTK_RECORDPROTO_PKG_IS_TARGZ + bool +config EMBTK_RECORDPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk index 483cfe8..4d96cb2 100644 --- a/packages/x11/recordproto/recordproto.mk +++ b/packages/x11/recordproto/recordproto.mk @@ -23,72 +23,17 @@ # \date June 2010 ################################################################################ -RECORDPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_RECORDPROTO_VERSION_STRING))) -RECORDPROTO_SITE := http://ftp.x.org/pub/individual/proto -RECORDPROTO_PACKAGE := recordproto-$(RECORDPROTO_VERSION).tar.bz2 -RECORDPROTO_BUILD_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION) - -RECORDPROTO_BINS = -RECORDPROTO_SBINS = -RECORDPROTO_INCLUDES = X11/extensions/recordconst.h \ +RECORDPROTO_NAME := recordproto +RECORDPROTO_VERSION := $(call embtk_get_pkgversion,recordproto) +RECORDPROTO_SITE := http://ftp.x.org/pub/individual/proto +RECORDPROTO_PACKAGE := recordproto-$(RECORDPROTO_VERSION).tar.bz2 +RECORDPROTO_SRC_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION) +RECORDPROTO_BUILD_DIR := $(PACKAGES_BUILD)/recordproto-$(RECORDPROTO_VERSION) + +RECORDPROTO_BINS = +RECORDPROTO_SBINS = +RECORDPROTO_INCLUDES = X11/extensions/recordconst.h \ X11/extensions/recordproto.h X11/extensions/recordstr.h -RECORDPROTO_LIBS = -RECORDPROTO_PKGCONFIGS = recordproto.pc - -recordproto_install: - @test -e $(RECORDPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(RECORDPROTO_BUILD_DIR)/.installed - -$(RECORDPROTO_BUILD_DIR)/.installed: download_recordproto \ - $(RECORDPROTO_BUILD_DIR)/.decompressed $(RECORDPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - recordproto-$(RECORDPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(RECORDPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_recordproto: - $(call embtk_generic_message,"Downloading $(RECORDPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) \ - $(RECORDPROTO_SITE)/$(RECORDPROTO_PACKAGE) - -$(RECORDPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(RECORDPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RECORDPROTO_PACKAGE) - @touch $@ - -$(RECORDPROTO_BUILD_DIR)/.configured: - $(Q)cd $(RECORDPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) - @touch $@ - -recordproto_clean: - $(call embtk_generic_message,"cleanup recordproto-$(RECORDPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RECORDPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RECORDPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RECORDPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RECORDPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS) - $(Q)-rm -rf $(RECORDPROTO_BUILD_DIR)* +RECORDPROTO_LIBS = +RECORDPROTO_PKGCONFIGS = recordproto.pc diff --git a/packages/x11/renderproto/renderproto.kconfig b/packages/x11/renderproto/renderproto.kconfig index ce7ffb4..8a7d81f 100644 --- a/packages/x11/renderproto/renderproto.kconfig +++ b/packages/x11/renderproto/renderproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_RENDERPROTO bool "Have renderproto" + select EMBTK_RENDERPROTO_PKG_IS_TARBZ2 help renderproto for X windowing system choice @@ -44,3 +45,11 @@ config EMBTK_RENDERPROTO_VERSION_STRING default "0.11.1" if EMBTK_RENDERPROTO_VERSION_0_11_1 default "0.11" if EMBTK_RENDERPROTO_VERSION_0_11 +config EMBTK_RENDERPROTO_NEED_PATCH + bool +config EMBTK_RENDERPROTO_NEED_AUTORECONF + bool +config EMBTK_RENDERPROTO_PKG_IS_TARGZ + bool +config EMBTK_RENDERPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/renderproto/renderproto.mk b/packages/x11/renderproto/renderproto.mk index 79d4b59..118e425 100644 --- a/packages/x11/renderproto/renderproto.mk +++ b/packages/x11/renderproto/renderproto.mk @@ -23,72 +23,16 @@ # \date March 2010 ################################################################################ -RENDERPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_RENDERPROTO_VERSION_STRING))) -RENDERPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -RENDERPROTO_PACKAGE := renderproto-$(RENDERPROTO_VERSION).tar.bz2 -RENDERPROTO_BUILD_DIR := $(PACKAGES_BUILD)/renderproto-$(RENDERPROTO_VERSION) - -RENDERPROTO_BINS = -RENDERPROTO_SBINS = -RENDERPROTO_INCLUDES = X11/extensions/render.h X11/extensions/renderproto.h -RENDERPROTO_LIBS = -RENDERPROTO_PKGCONFIGS = renderproto.pc - -renderproto_install: - @test -e $(RENDERPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(RENDERPROTO_BUILD_DIR)/.installed - -$(RENDERPROTO_BUILD_DIR)/.installed: download_renderproto \ - $(RENDERPROTO_BUILD_DIR)/.decompressed $(RENDERPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - renderproto-$(RENDERPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(RENDERPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(RENDERPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_renderproto: - $(call embtk_generic_message,"Downloading $(RENDERPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE) \ - $(RENDERPROTO_SITE)/$(RENDERPROTO_PACKAGE) - -$(RENDERPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(RENDERPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RENDERPROTO_PACKAGE) - @touch $@ - -$(RENDERPROTO_BUILD_DIR)/.configured: - $(Q)cd $(RENDERPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -renderproto_clean: - $(call embtk_generic_message,"cleanup renderproto-$(RENDERPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RENDERPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RENDERPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RENDERPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RENDERPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RENDERPROTO_PKGCONFIGS) - $(Q)-rm -rf $(RENDERPROTO_BUILD_DIR)* +RENDERPROTO_NAME := renderproto +RENDERPROTO_VERSION := $(call embtk_get_pkgversion,renderproto) +RENDERPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +RENDERPROTO_PACKAGE := renderproto-$(RENDERPROTO_VERSION).tar.bz2 +RENDERPROTO_SRC_DIR := $(PACKAGES_BUILD)/renderproto-$(RENDERPROTO_VERSION) +RENDERPROTO_BUILD_DIR := $(PACKAGES_BUILD)/renderproto-$(RENDERPROTO_VERSION) + +RENDERPROTO_BINS = +RENDERPROTO_SBINS = +RENDERPROTO_INCLUDES = X11/extensions/render.h X11/extensions/renderproto.h +RENDERPROTO_LIBS = +RENDERPROTO_PKGCONFIGS = renderproto.pc diff --git a/packages/x11/resourceproto/resourceproto.kconfig b/packages/x11/resourceproto/resourceproto.kconfig index 390991b..af47d1c 100644 --- a/packages/x11/resourceproto/resourceproto.kconfig +++ b/packages/x11/resourceproto/resourceproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_RESOURCEPROTO bool "Have resourceproto" + select EMBTK_RESOURCEPROTO_PKG_IS_TARBZ2 help resourceproto for X windowing system. This extension defines a protocol that allows a client to query @@ -48,3 +49,11 @@ config EMBTK_RESOURCEPROTO_VERSION_STRING default "1.1.1" if EMBTK_RESOURCEPROTO_VERSION_1_1_1 default "1.1.0" if EMBTK_RESOURCEPROTO_VERSION_1_1_0 +config EMBTK_RESOURCEPROTO_NEED_PATCH + bool +config EMBTK_RESOURCEPROTO_NEED_AUTORECONF + bool +config EMBTK_RESOURCEPROTO_PKG_IS_TARGZ + bool +config EMBTK_RESOURCEPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/resourceproto/resourceproto.mk b/packages/x11/resourceproto/resourceproto.mk index 847a5b9..c8fde89 100644 --- a/packages/x11/resourceproto/resourceproto.mk +++ b/packages/x11/resourceproto/resourceproto.mk @@ -23,10 +23,12 @@ # \date March 2010 ################################################################################ -RESOURCEPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_RESOURCEPROTO_VERSION_STRING))) -RESOURCEPROTO_SITE := http://ftp.x.org/pub/individual/proto -RESOURCEPROTO_PACKAGE := resourceproto-$(RESOURCEPROTO_VERSION).tar.bz2 -RESOURCEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/resourceproto-$(RESOURCEPROTO_VERSION) +RESOURCEPROTO_NAME := resourceproto +RESOURCEPROTO_VERSION := $(call embtk_get_pkgversion,resourceproto) +RESOURCEPROTO_SITE := http://ftp.x.org/pub/individual/proto +RESOURCEPROTO_PACKAGE := resourceproto-$(RESOURCEPROTO_VERSION).tar.bz2 +RESOURCEPROTO_SRC_DIR := $(PACKAGES_BUILD)/resourceproto-$(RESOURCEPROTO_VERSION) +RESOURCEPROTO_BUILD_DIR := $(PACKAGES_BUILD)/resourceproto-$(RESOURCEPROTO_VERSION) RESOURCEPROTO_BINS = RESOURCEPROTO_SBINS = @@ -34,61 +36,3 @@ RESOURCEPROTO_INCLUDES = X11/extensions/XResproto.h RESOURCEPROTO_LIBS = RESOURCEPROTO_PKGCONFIGS = resourceproto.pc -resourceproto_install: - @test -e $(RESOURCEPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(RESOURCEPROTO_BUILD_DIR)/.installed - -$(RESOURCEPROTO_BUILD_DIR)/.installed: download_resourceproto \ - $(RESOURCEPROTO_BUILD_DIR)/.decompressed $(RESOURCEPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - resourceproto-$(RESOURCEPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(RESOURCEPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(RESOURCEPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_resourceproto: - $(call embtk_generic_message,"Downloading $(RESOURCEPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE) \ - $(RESOURCEPROTO_SITE)/$(RESOURCEPROTO_PACKAGE) - -$(RESOURCEPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(RESOURCEPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(RESOURCEPROTO_PACKAGE) - @touch $@ - -$(RESOURCEPROTO_BUILD_DIR)/.configured: - $(Q)cd $(RESOURCEPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \ - --disable-malloc0returnsnull - @touch $@ - -resourceproto_clean: - $(call embtk_generic_message,"cleanup resourceproto-$(RESOURCEPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RESOURCEPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RESOURCEPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RESOURCEPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RESOURCEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RESOURCEPROTO_PKGCONFIGS) - $(Q)-rm -rf $(RESOURCEPROTO_BUILD_DIR)* - diff --git a/packages/x11/videoproto/videoproto.kconfig b/packages/x11/videoproto/videoproto.kconfig index b6bc12f..1881e7c 100644 --- a/packages/x11/videoproto/videoproto.kconfig +++ b/packages/x11/videoproto/videoproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_VIDEOPROTO bool "Have videoproto" + select EMBTK_VIDEOPROTO_PKG_IS_TARBZ2 help videoproto for X windowing system choice @@ -43,3 +44,12 @@ config EMBTK_VIDEOPROTO_VERSION_STRING string default "2.3.1" if EMBTK_VIDEOPROTO_VERSION_2_3_1 default "2.3.0" if EMBTK_VIDEOPROTO_VERSION_2_3_0 + +config EMBTK_VIDEOPROTO_NEED_PATCH + bool +config EMBTK_VIDEOPROTO_NEED_AUTORECONF + bool +config EMBTK_VIDEOPROTO_PKG_IS_TARGZ + bool +config EMBTK_VIDEOPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/videoproto/videoproto.mk b/packages/x11/videoproto/videoproto.mk index 49f4809..e3573e7 100644 --- a/packages/x11/videoproto/videoproto.mk +++ b/packages/x11/videoproto/videoproto.mk @@ -23,74 +23,18 @@ # \date March 2010 ################################################################################ -VIDEOPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_VIDEOPROTO_VERSION_STRING))) -VIDEOPROTO_SITE := http://ftp.x.org/pub/individual/proto -VIDEOPROTO_PACKAGE := videoproto-$(VIDEOPROTO_VERSION).tar.bz2 -VIDEOPROTO_BUILD_DIR := $(PACKAGES_BUILD)/videoproto-$(VIDEOPROTO_VERSION) - -VIDEOPROTO_BINS = -VIDEOPROTO_SBINS = -VIDEOPROTO_INCLUDES = X11/extensions/vldXvMC.h X11/extensions/Xv.h \ - X11/extensions/XvMC.h X11/extensions/XvMCproto.h \ +VIDEOPROTO_NAME := videoproto +VIDEOPROTO_VERSION := $(call embtk_get_pkgversion,videoproto) +VIDEOPROTO_SITE := http://ftp.x.org/pub/individual/proto +VIDEOPROTO_PACKAGE := videoproto-$(VIDEOPROTO_VERSION).tar.bz2 +VIDEOPROTO_SRC_DIR := $(PACKAGES_BUILD)/videoproto-$(VIDEOPROTO_VERSION) +VIDEOPROTO_BUILD_DIR := $(PACKAGES_BUILD)/videoproto-$(VIDEOPROTO_VERSION) + +VIDEOPROTO_BINS = +VIDEOPROTO_SBINS = +VIDEOPROTO_INCLUDES = X11/extensions/vldXvMC.h X11/extensions/Xv.h \ + X11/extensions/XvMC.h X11/extensions/XvMCproto.h \ X11/extensions/Xvproto.h -VIDEOPROTO_LIBS = -VIDEOPROTO_PKGCONFIGS = videoproto.pc - -videoproto_install: - @test -e $(VIDEOPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(VIDEOPROTO_BUILD_DIR)/.installed - -$(VIDEOPROTO_BUILD_DIR)/.installed: download_videoproto \ - $(VIDEOPROTO_BUILD_DIR)/.decompressed $(VIDEOPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - videoproto-$(VIDEOPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(VIDEOPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(VIDEOPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_videoproto: - $(call embtk_generic_message,"Downloading $(VIDEOPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE) \ - $(VIDEOPROTO_SITE)/$(VIDEOPROTO_PACKAGE) - -$(VIDEOPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(VIDEOPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(VIDEOPROTO_PACKAGE) - @touch $@ - -$(VIDEOPROTO_BUILD_DIR)/.configured: - $(Q)cd $(VIDEOPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) --prefix=/usr \ - --disable-malloc0returnsnull - @touch $@ - -videoproto_clean: - $(call embtk_generic_message,"cleanup videoproto-$(VIDEOPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(VIDEOPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(VIDEOPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(VIDEOPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(VIDEOPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(VIDEOPROTO_PKGCONFIGS) - $(Q)-rm -rf $(VIDEOPROTO_BUILD_DIR)* +VIDEOPROTO_LIBS = +VIDEOPROTO_PKGCONFIGS = videoproto.pc diff --git a/packages/x11/xcbproto/xcbproto.kconfig b/packages/x11/xcbproto/xcbproto.kconfig index 0673460..4f17cd2 100644 --- a/packages/x11/xcbproto/xcbproto.kconfig +++ b/packages/x11/xcbproto/xcbproto.kconfig @@ -24,6 +24,7 @@ config EMBTK_HAVE_XCBPROTO bool "Have xcbproto" + select EMBTK_XCBPROTO_PKG_IS_TARGZ help xcbproto for X windowing system choice @@ -40,3 +41,11 @@ config EMBTK_XCBPROTO_VERSION_STRING string default "1.6" if EMBTK_XCBPROTO_VERSION_1_6 +config EMBTK_XCBPROTO_NEED_PATCH + bool +config EMBTK_XCBPROTO_NEED_AUTORECONF + bool +config EMBTK_XCBPROTO_PKG_IS_TARGZ + bool +config EMBTK_XCBPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/xcbproto/xcbproto.mk b/packages/x11/xcbproto/xcbproto.mk index 646895a..70d5280 100644 --- a/packages/x11/xcbproto/xcbproto.mk +++ b/packages/x11/xcbproto/xcbproto.mk @@ -22,10 +22,12 @@ # \date March 2010 ################################################################################ -XCBPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XCBPROTO_VERSION_STRING))) -XCBPROTO_SITE := http://xcb.freedesktop.org/dist -XCBPROTO_PACKAGE := xcb-proto-$(XCBPROTO_VERSION).tar.gz -XCBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcb-proto-$(XCBPROTO_VERSION) +XCBPROTO_NAME := xcb-proto +XCBPROTO_VERSION := $(call embtk_get_pkgversion,xcbproto) +XCBPROTO_SITE := http://xcb.freedesktop.org/dist +XCBPROTO_PACKAGE := xcb-proto-$(XCBPROTO_VERSION).tar.gz +XCBPROTO_SRC_DIR := $(PACKAGES_BUILD)/xcb-proto-$(XCBPROTO_VERSION) +XCBPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcb-proto-$(XCBPROTO_VERSION) XCBPROTO_BINS = XCBPROTO_SBINS = @@ -33,61 +35,3 @@ XCBPROTO_INCLUDES = XCBPROTO_LIBS = python2.6/dist-packages/xcbgen XCBPROTO_PKGCONFIGS = xcb-proto.pc -xcbproto_install: - @test -e $(XCBPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(XCBPROTO_BUILD_DIR)/.installed - -$(XCBPROTO_BUILD_DIR)/.installed: download_xcbproto \ - $(XCBPROTO_BUILD_DIR)/.decompressed $(XCBPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - xcbproto-$(XCBPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(XCBPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(XCBPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_xcbproto: - $(call embtk_generic_message,"Downloading $(XCBPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE) \ - $(XCBPROTO_SITE)/$(XCBPROTO_PACKAGE) - -$(XCBPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(XCBPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(XCBPROTO_PACKAGE) - @touch $@ - -$(XCBPROTO_BUILD_DIR)/.configured: - $(Q)cd $(XCBPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) \ - --prefix=/usr --libdir=/usr/$(LIBDIR) - @touch $@ - -xcbproto_clean: - $(call embtk_generic_message,"cleanup xcbproto-$(XCBPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCBPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCBPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCBPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCBPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCBPROTO_PKGCONFIGS) - $(Q)-rm -rf $(XCBPROTO_BUILD_DIR)* - diff --git a/packages/x11/xcmiscproto/xcmiscproto.kconfig b/packages/x11/xcmiscproto/xcmiscproto.kconfig index 46b7728..8497cf9 100644 --- a/packages/x11/xcmiscproto/xcmiscproto.kconfig +++ b/packages/x11/xcmiscproto/xcmiscproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_XCMISCPROTO bool "Have xcmiscproto" + select EMBTK_XCMISCPROTO_PKG_IS_TARBZ2 help xcmiscproto for X windowing system. XC-MISC Extension: This extension defines a protocol that @@ -48,3 +49,11 @@ config EMBTK_XCMISCPROTO_VERSION_STRING default "1.2.1" if EMBTK_XCMISCPROTO_VERSION_1_2_1 default "1.2.0" if EMBTK_XCMISCPROTO_VERSION_1_2_0 +config EMBTK_XCMISCPROTO_NEED_PATCH + bool +config EMBTK_XCMISCPROTO_NEED_AUTORECONF + bool +config EMBTK_XCMISCPROTO_PKG_IS_TARGZ + bool +config EMBTK_XCMISCPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/xcmiscproto/xcmiscproto.mk b/packages/x11/xcmiscproto/xcmiscproto.mk index e27938a..de1fd65 100644 --- a/packages/x11/xcmiscproto/xcmiscproto.mk +++ b/packages/x11/xcmiscproto/xcmiscproto.mk @@ -23,72 +23,16 @@ # \date March 2010 ################################################################################ -XCMISCPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XCMISCPROTO_VERSION_STRING))) -XCMISCPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -XCMISCPROTO_PACKAGE := xcmiscproto-$(XCMISCPROTO_VERSION).tar.bz2 -XCMISCPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcmiscproto-$(XCMISCPROTO_VERSION) - -XCMISCPROTO_BINS = -XCMISCPROTO_SBINS = -XCMISCPROTO_INCLUDES = X11/extensions/xcmiscproto.h X11/extensions/xcmiscstr.h -XCMISCPROTO_LIBS = -XCMISCPROTO_PKGCONFIGS = xcmiscproto.pc - -xcmiscproto_install: - @test -e $(XCMISCPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(XCMISCPROTO_BUILD_DIR)/.installed - -$(XCMISCPROTO_BUILD_DIR)/.installed: download_xcmiscproto \ - $(XCMISCPROTO_BUILD_DIR)/.decompressed $(XCMISCPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - xcmiscproto-$(XCMISCPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(XCMISCPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(XCMISCPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_xcmiscproto: - $(call embtk_generic_message,"Downloading $(XCMISCPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE) \ - $(XCMISCPROTO_SITE)/$(XCMISCPROTO_PACKAGE) - -$(XCMISCPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(XCMISCPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XCMISCPROTO_PACKAGE) - @touch $@ - -$(XCMISCPROTO_BUILD_DIR)/.configured: - $(Q)cd $(XCMISCPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -xcmiscproto_clean: - $(call embtk_generic_message,"cleanup xcmiscproto-$(XCMISCPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCMISCPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCMISCPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCMISCPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCMISCPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCMISCPROTO_PKGCONFIGS) - $(Q)-rm -rf $(XCMISCPROTO_BUILD_DIR)* +XCMISCPROTO_NAME := xcmiscproto +XCMISCPROTO_VERSION := $(call embtk_get_pkgversion,xcmiscproto) +XCMISCPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +XCMISCPROTO_PACKAGE := xcmiscproto-$(XCMISCPROTO_VERSION).tar.bz2 +XCMISCPROTO_SRC_DIR := $(PACKAGES_BUILD)/xcmiscproto-$(XCMISCPROTO_VERSION) +XCMISCPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xcmiscproto-$(XCMISCPROTO_VERSION) + +XCMISCPROTO_BINS = +XCMISCPROTO_SBINS = +XCMISCPROTO_INCLUDES = X11/extensions/xcmiscproto.h X11/extensions/xcmiscstr.h +XCMISCPROTO_LIBS = +XCMISCPROTO_PKGCONFIGS = xcmiscproto.pc diff --git a/packages/x11/xextproto/xextproto.kconfig b/packages/x11/xextproto/xextproto.kconfig index 95e67dc..1b5c00f 100644 --- a/packages/x11/xextproto/xextproto.kconfig +++ b/packages/x11/xextproto/xextproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_XEXTPROTO bool "Have xextproto" + select EMBTK_XEXTPROTO_PKG_IS_TARBZ2 help xextproto for X window system choice @@ -44,3 +45,11 @@ config EMBTK_XEXTPROTO_VERSION_STRING default "7.1.2" if EMBTK_XEXTPROTO_VERSION_7_1_2 default "7.1.1" if EMBTK_XEXTPROTO_VERSION_7_1_1 +config EMBTK_XEXTPROTO_NEED_PATCH + bool +config EMBTK_XEXTPROTO_NEED_AUTORECONF + bool +config EMBTK_XEXTPROTO_PKG_IS_TARGZ + bool +config EMBTK_XEXTPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/xextproto/xextproto.mk b/packages/x11/xextproto/xextproto.mk index c8921c2..5e76d9e 100644 --- a/packages/x11/xextproto/xextproto.mk +++ b/packages/x11/xextproto/xextproto.mk @@ -23,10 +23,12 @@ # \date March 2010 ################################################################################ -XEXTPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XEXTPROTO_VERSION_STRING))) -XEXTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto -XEXTPROTO_PACKAGE := xextproto-$(XEXTPROTO_VERSION).tar.bz2 -XEXTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xextproto-$(XEXTPROTO_VERSION) +XEXTPROTO_NAME := xextproto +XEXTPROTO_VERSION := $(call embtk_get_pkgversion,xextproto) +XEXTPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto +XEXTPROTO_PACKAGE := xextproto-$(XEXTPROTO_VERSION).tar.bz2 +XEXTPROTO_SRC_DIR := $(PACKAGES_BUILD)/xextproto-$(XEXTPROTO_VERSION) +XEXTPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xextproto-$(XEXTPROTO_VERSION) XEXTPROTO_BINS = XEXTPROTO_SBINS = @@ -48,61 +50,3 @@ XEXTPROTO_INCLUDES = X11/extensions/ag.h X11/extensions/cupproto.h \ XEXTPROTO_LIBS = XEXTPROTO_PKGCONFIGS = xextproto.pc -xextproto_install: - @test -e $(XEXTPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(XEXTPROTO_BUILD_DIR)/.installed - -$(XEXTPROTO_BUILD_DIR)/.installed: download_xextproto \ - $(XEXTPROTO_BUILD_DIR)/.decompressed $(XEXTPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - xextproto-$(XEXTPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(XEXTPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(XEXTPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_xextproto: - $(call embtk_generic_message,"Downloading $(XEXTPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE) \ - $(XEXTPROTO_SITE)/$(XEXTPROTO_PACKAGE) - -$(XEXTPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(XEXTPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XEXTPROTO_PACKAGE) - @touch $@ - -$(XEXTPROTO_BUILD_DIR)/.configured: - $(Q)cd $(XEXTPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -xextproto_clean: - $(call embtk_generic_message,"cleanup xextproto-$(XEXTPROTO_VERSION)...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XEXTPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XEXTPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XEXTPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XEXTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XEXTPROTO_PKGCONFIGS) - $(Q)-rm -rf $(XEXTPROTO_BUILD_DIR)* - diff --git a/packages/x11/xproto/xproto.kconfig b/packages/x11/xproto/xproto.kconfig index b5a3b91..1bc7bf0 100644 --- a/packages/x11/xproto/xproto.kconfig +++ b/packages/x11/xproto/xproto.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_XPROTO bool "Have xproto" + select EMBTK_XPROTO_PKG_IS_TARBZ2 help xproto for X windowing system. xproto provides the headers and specification documents @@ -59,3 +60,11 @@ config EMBTK_XPROTO_VERSION_STRING default "7.0.17" if EMBTK_XPROTO_VERSION_7_0_17 default "7.0.16" if EMBTK_XPROTO_VERSION_7_0_16 +config EMBTK_XPROTO_NEED_PATCH + bool +config EMBTK_XPROTO_NEED_AUTORECONF + bool +config EMBTK_XPROTO_PKG_IS_TARGZ + bool +config EMBTK_XPROTO_PKG_IS_TARBZ2 + bool diff --git a/packages/x11/xproto/xproto.mk b/packages/x11/xproto/xproto.mk index 72be7fb..a6d6d0b 100644 --- a/packages/x11/xproto/xproto.mk +++ b/packages/x11/xproto/xproto.mk @@ -23,75 +23,19 @@ # \date March 2010 ################################################################################ -XPROTO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XPROTO_VERSION_STRING))) -XPROTO_SITE := http://ftp.x.org/pub/individual/proto -XPROTO_PACKAGE := xproto-$(XPROTO_VERSION).tar.bz2 -XPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xproto-$(XPROTO_VERSION) - -XPROTO_BINS = -XPROTO_SBINS = -XPROTO_INCLUDES = X11/keysymdef.h X11/Xalloca.h X11/Xatom.h X11/XF86keysym.h \ +XPROTO_NAME := xproto +XPROTO_VERSION := $(call embtk_get_pkgversion,xproto) +XPROTO_SITE := http://ftp.x.org/pub/individual/proto +XPROTO_PACKAGE := xproto-$(XPROTO_VERSION).tar.bz2 +XPROTO_SRC_DIR := $(PACKAGES_BUILD)/xproto-$(XPROTO_VERSION) +XPROTO_BUILD_DIR := $(PACKAGES_BUILD)/xproto-$(XPROTO_VERSION) + +XPROTO_BINS = +XPROTO_SBINS = +XPROTO_INCLUDES = X11/keysymdef.h X11/Xalloca.h X11/Xatom.h X11/XF86keysym.h \ X11/Xfuncs.h Xmd.h X11/Xos.h X11/Xpoll.h X11/Xprotostr.h \ X11/keysym.h X11/Xarch.h X11/Xdefs.h X11/Xfuncproto.h X11/X.h \ X11/Xosdefs.h X11/Xos_r.h X11/Xproto.h X11/Xthreads.h -XPROTO_LIBS = +XPROTO_LIBS = XPROTO_PKGCONFIGS = xproto.pc -xproto_install: - @test -e $(XPROTO_BUILD_DIR)/.installed || \ - $(MAKE) $(XPROTO_BUILD_DIR)/.installed - -$(XPROTO_BUILD_DIR)/.installed: download_xproto \ - $(XPROTO_BUILD_DIR)/.decompressed $(XPROTO_BUILD_DIR)/.configured - $(call embtk_generic_message,"Compiling and installing \ - xproto-$(XPROTO_VERSION) in your root filesystem...") - $(Q)$(MAKE) -C $(XPROTO_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(XPROTO_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - @touch $@ - -download_xproto: - $(call embtk_generic_message,"Downloading $(XPROTO_PACKAGE) \ - if necessary...") - @test -e $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE) \ - $(XPROTO_SITE)/$(XPROTO_PACKAGE) - -$(XPROTO_BUILD_DIR)/.decompressed: - $(call embtk_generic_message,"Decompressing $(XPROTO_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(XPROTO_PACKAGE) - @touch $@ - -$(XPROTO_BUILD_DIR)/.configured: - $(Q)cd $(XPROTO_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=$(EMBTK_PKG_CONFIG_PATH) \ - ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ - --target=$(STRICT_GNU_TARGET) --prefix=/usr --libdir=/usr/$(LIBDIR) \ - --disable-malloc0returnsnull - @touch $@ - -xproto_clean: - $(call embtk_generic_message,"cleanup xproto...") - $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XPROTO_BINS) - $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XPROTO_SBINS) - $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XPROTO_PKGCONFIGS) - $(Q)-rm -rf $(XPROTO_BUILD_DIR)* - |