From patchwork Mon Mar 3 22:53:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Ruder X-Patchwork-Id: 326091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BAEA92C00C6 for ; Tue, 4 Mar 2014 10:00:12 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D15B3F3FE; Mon, 3 Mar 2014 23:00:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id THlVS5uh7kwi; Mon, 3 Mar 2014 23:00:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC117F250; Mon, 3 Mar 2014 23:00:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5D4FD1CE9D2 for ; Mon, 3 Mar 2014 23:00:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 57A1191770 for ; Mon, 3 Mar 2014 23:00:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NsoF5GtcJ8aP for ; Mon, 3 Mar 2014 23:00:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 222ED9175A for ; Mon, 3 Mar 2014 23:00:08 +0000 (UTC) Received: by mail-ie0-f169.google.com with SMTP id to1so625715ieb.28 for ; Mon, 03 Mar 2014 15:00:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=AH/Y8prKmkRQEhJraj1b1tgRV0kC5CKc8zuJgJM92x8=; b=Fs9wIJ5jiAUF0aqTgY3h5Bq/0X904W+yD4p8zIk0jveyfbtNSEfDuuOVIwXVbKnA1A rMoFUm5FJ4X6G8I/n1czXUzat1BCMbutgUeXoIHZCtPECfjiY7uf/uOl6SdZh6WE5Jqw gUt+FHi/3CY4AbiuVWLAcDlkdjNfs5dR0gUwtXck68deJIki4zkTLNVgw5l+3xwsCFH4 Ie0uSUKo5lyIcYa+Ru+2+fsIsTY/k3312wRY/YHRl4FNqIFkkOKQIlbKvN40qV54K1JA Rj/tNFoQFOdMgKSnAKcE1gDqhb2s1dPbweFTfan4rhglaqONDMKWcnIIz6W0E4R2QSkk 1Cog== X-Gm-Message-State: ALoCoQm7I08lXsUV1WxBR9paoC1fMrTiSEA2gI34TWMXJdS6Un9wtBV+qpvcMs91VFR+rOfQRrYS X-Received: by 10.43.79.66 with SMTP id zp2mr3621699icb.76.1393887222365; Mon, 03 Mar 2014 14:53:42 -0800 (PST) Received: from andrewruder-hplin.dci.local (64-198-156-98.ip.mcleodusa.net. [64.198.156.98]) by mx.google.com with ESMTPSA id ji9sm27674678igb.1.2014.03.03.14.53.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Mar 2014 14:53:41 -0800 (PST) From: Andrew Ruder To: buildroot@busybox.net Date: Mon, 3 Mar 2014 16:53:07 -0600 Message-Id: <1393887187-29706-1-git-send-email-andrew.ruder@elecsyscorp.com> X-Mailer: git-send-email 1.9.0.rc3.12.gbc97e2d Cc: Andrew Ruder Subject: [Buildroot] [PATCH] tcl: bump to version 8.6.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net We carry a patch that turns off building compatibility layers for old/broken versions of standard functions (strstr, strtoul, strtod) with the assumption that anything buildroot is targetting with the standard C library will be good enough. Signed-off-by: Andrew Ruder --- package/tcl/Config.in | 6 +++--- package/tcl/tcl-0001-dont-build-compat.patch | 21 +++++++++++++++++++ package/tcl/tcl-8.4.19-strtod.patch | 11 ---------- package/tcl/tcl.mk | 31 ++++++++++++++++++++++------ package/tcllib/tcllib.mk | 2 +- 5 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 package/tcl/tcl-0001-dont-build-compat.patch delete mode 100644 package/tcl/tcl-8.4.19-strtod.patch diff --git a/package/tcl/Config.in b/package/tcl/Config.in index 5dcf63d..3fe8ef5 100644 --- a/package/tcl/Config.in +++ b/package/tcl/Config.in @@ -8,21 +8,21 @@ config BR2_PACKAGE_TCL if BR2_PACKAGE_TCL config BR2_PACKAGE_TCL_DEL_ENCODINGS - bool "delete encodings (saves 1.4Mb)" + bool "delete encodings (saves 1.6Mb)" default y help Delete encoding files for TCL. If your programs do not use various tcl character recoding functions, you may safely choose Y here. - It saves approx. 1.4 Mb of space. + It saves approx. 1.6 Mb of space. config BR2_PACKAGE_TCL_SHLIB_ONLY bool "install only shared library" default y help Install only TCL shared library and not binary tcl - interpreter(tclsh8.4). + interpreter (tclsh). Saves ~14kb. diff --git a/package/tcl/tcl-0001-dont-build-compat.patch b/package/tcl/tcl-0001-dont-build-compat.patch new file mode 100644 index 0000000..b008737 --- /dev/null +++ b/package/tcl/tcl-0001-dont-build-compat.patch @@ -0,0 +1,21 @@ +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -2466,7 +2466,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [ + } + exit(0); + }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy, +- tcl_cv_strtod_buggy=buggy)]) ++ tcl_cv_strtod_buggy=ok)]) + if test "$tcl_cv_strtod_buggy" = buggy; then + AC_LIBOBJ([fixstrtod]) + USE_COMPAT=1 +@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ + if test ["$tcl_ok"] = 1; then + AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken], + AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, +- [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown)) ++ [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=ok)) + if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then + tcl_ok=1 + else diff --git a/package/tcl/tcl-8.4.19-strtod.patch b/package/tcl/tcl-8.4.19-strtod.patch deleted file mode 100644 index a997454..0000000 --- a/package/tcl/tcl-8.4.19-strtod.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcl8.4.9/compat/strtod.c 2002-02-25 16:26:12.000000000 +0200 -+++ tcl8.4.9/compat/strtod.c 2005-05-30 08:55:18.000000000 +0300 -@@ -24,6 +24,8 @@ - #define NULL 0 - #endif - -+#undef strtod -+ - static int maxExponent = 511; /* Largest possible base 10 exponent. Any - * exponent larger than this will already - * produce underflow or overflow, so there's diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 58f085a..9fbe8c5 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -4,8 +4,8 @@ # ################################################################################ -TCL_VERSION_MAJOR = 8.4 -TCL_VERSION_MINOR = 19 +TCL_VERSION_MAJOR = 8.6 +TCL_VERSION_MINOR = 1 TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR) TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) @@ -13,6 +13,7 @@ TCL_LICENSE = tcl license TCL_LICENSE_FILES = license.terms TCL_SUBDIR = unix TCL_INSTALL_STAGING = YES +TCL_AUTORECONF = YES TCL_CONF_OPT = \ --disable-symbols \ --disable-langinfo \ @@ -42,12 +43,30 @@ endef TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH endif -# library get installed read only, so strip fails -define TCL_FIXUP_RO_LIB - chmod +w $(TARGET_DIR)/usr/lib/libtcl* +ifneq ($(BR2_PACKAGE_SQLITE),y) +define TCL_REMOVE_SQLITE + rm -fr $(TARGET_DIR)/usr/lib/sqlite3.8.0 $(TARGET_DIR)/usr/lib/tdbcsqlite3-1.0.0 endef +TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_SQLITE +endif + +define TCL_REMOVE_EXTRA + rm -fr $(TARGET_DIR)/usr/lib/tdbcmysql1.0.0 \ + $(TARGET_DIR)/usr/lib/tdbcodbc1.0.0 \ + $(TARGET_DIR)/usr/lib/tdbcpostgres1.0.0 \ + $(TARGET_DIR)/usr/lib/tclConfig.sh \ + $(TARGET_DIR)/usr/lib/tclooConfig.sh +endef +TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA -TCL_POST_INSTALL_TARGET_HOOKS += TCL_FIXUP_RO_LIB +ifneq ($(BR2_PACKAGE_SQLITE),y) +define TCL_REMOVE_SQLITE + rm -fr $(TARGET_DIR)/usr/lib/sqlite3.8.0 \ + $(TARGET_DIR)/usr/lib/tdbcsqlite3-1.0.0 \ + $(TARGET_DIR)/usr/lib/tdbc1.0.0 +endef +TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_SQLITE +endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk index f2aca36..ae2e4da 100644 --- a/package/tcllib/tcllib.mk +++ b/package/tcllib/tcllib.mk @@ -10,6 +10,6 @@ TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$( TCLLIB_LICENSE = tcl license TCLLIB_LICENSE_FILES = license.terms TCLLIB_DEPENDENCIES = host-tcl -TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh8.4" +TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh8.6" $(eval $(autotools-package))