diff options
| -rw-r--r-- | kconfig/pkgconfig.kconfig | 44 | ||||
| -rw-r--r-- | kconfig/toolchain.kconfig | 26 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 57 |
3 files changed, 76 insertions, 51 deletions
diff --git a/kconfig/pkgconfig.kconfig b/kconfig/pkgconfig.kconfig new file mode 100644 index 0000000..c3f3963 --- /dev/null +++ b/kconfig/pkgconfig.kconfig @@ -0,0 +1,44 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2011 Abdoulaye Walsimou GAYE. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +################################################################################ +# +# \file pkgconfig.kconfig +# \brief pkgconfig.kconfig of Embtoolkit. +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date January 2011 +################################################################################ + +config EMBTK_HAVE_PKGCONFIG + bool + select EMBTK_PKGCONFIG_PKG_IS_TARGZ + default y + help + pkgconfig for host tools. + +config EMBTK_PKGCONFIG_VERSION_STRING + string + default "0.25" + +config EMBTK_PKGCONFIG_NEED_PATCH + bool +config EMBTK_PKGCONFIG_NEED_AUTORECONF + bool +config EMBTK_PKGCONFIG_PKG_IS_TARGZ + bool +config EMBTK_PKGCONFIG_PKG_IS_TARBZ2 + bool diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig index 9e9b685..d577acc 100644 --- a/kconfig/toolchain.kconfig +++ b/kconfig/toolchain.kconfig @@ -2,18 +2,19 @@ # Embtoolkit # Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file toolchain.kconfig @@ -84,3 +85,8 @@ source kconfig/m4.kconfig source kconfig/libtool.kconfig source kconfig/autoconf.kconfig source kconfig/automake.kconfig + +# +# pkg-config +# +source kconfig/pkgconfig.kconfig diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index 8c65d12..f618423 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -1,5 +1,5 @@ ################################################################################ -# Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> +# Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE. # # This program is free software: you can redistribute it and/or modify @@ -19,54 +19,29 @@ # # \file pkgconfig.mk # \brief pkgconfig.mk of Embtoolkit -# \author Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date October 2009 ################################################################################ -PKGCONFIG_VERSION := 0.25 -PKGCONFIG_SITE := http://pkgconfig.freedesktop.org/releases -PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz -PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) -PKGCONFIG_DIR := $(HOSTTOOLS)/usr/local/pkg-config -PKGCONFIG_BIN := $(PKGCONFIG_DIR)/bin/pkg-config - -export PKGCONFIG_BIN +PKGCONFIG_NAME := pkg-config +PKGCONFIG_VERSION := $(call EMBTK_GET_PKG_VERSION,PKGCONFIG) +PKGCONFIG_SITE := http://pkgconfig.freedesktop.org/releases +PKGCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +PKGCONFIG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/automake/$(PKGCONFIG_VERSION) +PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz +PKGCONFIG_SRC_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) +PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) +PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig +PKG_CONFIG_PATH :=$(SYSROOT)/usr/lib32/pkgconfig else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig +PKG_CONFIG_PATH :=$(SYSROOT)/usr/lib/pkgconfig endif - -export PKG_CONFIG_PATH +export PKGCONFIG_BIN PKG_CONFIG_PATH pkgconfig_install: - @test -e $(PKGCONFIG_BUILD_DIR)/.installed || \ - $(MAKE) $(PKGCONFIG_BUILD_DIR)/.installed - -$(PKGCONFIG_BUILD_DIR)/.installed: download_pkgconfig \ - $(PKGCONFIG_BUILD_DIR)/.decompressed $(PKGCONFIG_BUILD_DIR)/.configured - @$(MAKE) -C $(PKGCONFIG_BUILD_DIR) $(J) - @$(MAKE) -C $(PKGCONFIG_BUILD_DIR) install - @touch $@ + $(call EMBTK_INSTALL_HOSTPKG,PKGCONFIG) download_pkgconfig: - $(call EMBTK_GENERIC_MESSAGE,"Downloading $(PKGCONFIG_PACKAGE) if \ - necessary...") - @test -e $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE) \ - $(PKGCONFIG_SITE)/$(PKGCONFIG_PACKAGE) - -$(PKGCONFIG_BUILD_DIR)/.decompressed: - $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(PKGCONFIG_PACKAGE)...") - @tar -C $(TOOLS_BUILD) -xzf $(DOWNLOAD_DIR)/$(PKGCONFIG_PACKAGE) - @touch $@ - -$(PKGCONFIG_BUILD_DIR)/.configured: - $(call EMBTK_GENERIC_MESSAGE,"Configuring \ - pkg-config-$(PKGCONFIG_VERSION)...") - @cd $(PKGCONFIG_BUILD_DIR); \ - ./configure \ - --prefix=$(PKGCONFIG_DIR) --build=$(HOST_BUILD) --host=$(HOST_ARCH) - @touch $@ - + $(call EMBTK_DOWNLOAD_PKG,PKGCONFIG) |