diff options
| -rw-r--r-- | core/toolchain/toolchain.mk | 4 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 2 | ||||
| -rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 | ||||
| -rw-r--r-- | packages/htools/libtool/libtool.kconfig (renamed from core/kconfig/libtool.kconfig) | 12 | ||||
| -rw-r--r-- | packages/htools/libtool/libtool.mk | 31 | ||||
| -rw-r--r-- | packages/htools/libtool/vars.mk (renamed from core/mk/libtool.mk) | 15 |
6 files changed, 44 insertions, 23 deletions
diff --git a/core/toolchain/toolchain.mk b/core/toolchain/toolchain.mk index cde6306..265617f 100644 --- a/core/toolchain/toolchain.mk +++ b/core/toolchain/toolchain.mk @@ -30,6 +30,7 @@ embtk_pkgincdir := toolchain include core/toolchain/vars.mk include packages/htools/ccache/vars.mk include packages/htools/m4/vars.mk +include packages/htools/libtool/vars.mk # GMP include core/mk/gmp.mk @@ -81,10 +82,9 @@ TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install # # Autotools # -include core/mk/libtool.mk include core/mk/autoconf.mk include core/mk/automake.mk -AUTOTOOLS_INSTALL := m4_host_install libtool_install autoconf_install +AUTOTOOLS_INSTALL := m4_host_install libtool_host_install autoconf_install AUTOTOOLS_INSTALL += automake_install # GNU sed diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index 4541439..1abbf89 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -103,7 +103,7 @@ source packages/htools/ccache/ccache.kconfig # Autotools # source packages/htools/m4/m4.kconfig -source core/kconfig/libtool.kconfig +source packages/htools/libtool/libtool.kconfig source core/kconfig/autoconf.kconfig source core/kconfig/automake.kconfig diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index c7be0ad..5436f6e 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -32,6 +32,9 @@ $(call embtk_include_hostpkg,ccache_host) include packages/htools/fakeroot/vars.mk $(call embtk_include_hostpkg,fakeroot_host) +# libtool +$(call embtk_include_hostpkg,libtool_host) + # mtd-utils $(call embtk_include_hostpkg,mtdutils_host) diff --git a/core/kconfig/libtool.kconfig b/packages/htools/libtool/libtool.kconfig index 56fe2e2..e222418 100644 --- a/core/kconfig/libtool.kconfig +++ b/packages/htools/libtool/libtool.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-2014 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 @@ -23,17 +23,17 @@ # \date January 2011 ################################################################################ -config EMBTK_HAVE_LIBTOOL +config EMBTK_HOST_HAVE_LIBTOOL bool default y help - libtool for autotools. + libtool for autotools. -config EMBTK_LIBTOOL_VERSION_STRING +config EMBTK_LIBTOOL_HOST_VERSION_STRING string default "2.4.2" -config EMBTK_LIBTOOL_NEED_PATCH +config EMBTK_LIBTOOL_HOST_NEED_PATCH bool -config EMBTK_LIBTOOL_NEED_AUTORECONF +config EMBTK_LIBTOOL_HOST_NEED_AUTORECONF bool diff --git a/packages/htools/libtool/libtool.mk b/packages/htools/libtool/libtool.mk new file mode 100644 index 0000000..6900afd --- /dev/null +++ b/packages/htools/libtool/libtool.mk @@ -0,0 +1,31 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2010-2014 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 libtool.mk +# \brief libtool.mk of Embtoolkit. +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date March 2010 +################################################################################ + +LIBTOOL_HOST_NAME := libtool +LIBTOOL_HOST_VERSION := $(call embtk_get_pkgversion,libtool_host) +LIBTOOL_HOST_SITE := http://ftp.gnu.org/gnu/libtool +LIBTOOL_HOST_PACKAGE := libtool-$(LIBTOOL_HOST_VERSION).tar.gz +LIBTOOL_HOST_SRC_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_HOST_VERSION) +LIBTOOL_HOST_BUILD_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_HOST_VERSION) diff --git a/core/mk/libtool.mk b/packages/htools/libtool/vars.mk index cdcd29e..71c8816 100644 --- a/core/mk/libtool.mk +++ b/packages/htools/libtool/vars.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010-2013 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-2014 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 @@ -23,19 +23,6 @@ # \date March 2010 ################################################################################ -LIBTOOL_NAME := libtool -LIBTOOL_VERSION := $(call embtk_get_pkgversion,libtool) -LIBTOOL_SITE := http://ftp.gnu.org/gnu/libtool -LIBTOOL_PACKAGE := libtool-$(LIBTOOL_VERSION).tar.gz -LIBTOOL_SRC_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION) -LIBTOOL_BUILD_DIR := $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION) - LIBTOOL := $(embtk_htools)/usr/bin/libtool LIBTOOLIZE := $(embtk_htools)/usr/bin/libtoolize export LIBTOOL LIBTOOLIZE - -LIBTOOL_CONFIGURE_OPTS := --disable-ltdl-install - -define embtk_install_libtool - $(call __embtk_install_hostpkg,libtool) -endef |