summaryrefslogtreecommitdiff
path: root/package/tcl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2014-01-20 21:58:30 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2014-01-20 21:58:30 +0100
commit1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (patch)
tree944cd85a8aa8374a3753289eb9b9ba6a4b6cd2bf /package/tcl
parent00b8e7c5d5b969d043f2380fe3769892c3376012 (diff)
parent573562745c1c063d2c2f7bc1254c290b64ec0110 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/tcl')
-rw-r--r--package/tcl/Makefile2
-rw-r--r--package/tcl/patches/patch-generic_tcl_h11
-rw-r--r--package/tcl/patches/patch-unix_Makefile_in6
-rw-r--r--package/tcl/patches/patch-unix_configure10
4 files changed, 20 insertions, 9 deletions
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index f45317d8f..df231ffdc 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tcl
PKG_VERSION:= 8.5.9
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 8512d8db3233041dd68a81476906012a
PKG_DESCR:= TCL scripting language
PKG_SECTION:= lang
diff --git a/package/tcl/patches/patch-generic_tcl_h b/package/tcl/patches/patch-generic_tcl_h
new file mode 100644
index 000000000..6263ba8f1
--- /dev/null
+++ b/package/tcl/patches/patch-generic_tcl_h
@@ -0,0 +1,11 @@
+--- tcl8.5.9.orig/generic/tcl.h 2010-08-04 19:02:39.000000000 +0200
++++ tcl8.5.9/generic/tcl.h 2014-01-20 11:18:37.000000000 +0100
+@@ -19,6 +19,8 @@
+ #ifndef _TCL
+ #define _TCL
+
++#include <sys/stat.h>
++
+ /*
+ * For C++ compilers, use extern "C"
+ */
diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in
index 7c4a9ca93..38340c80b 100644
--- a/package/tcl/patches/patch-unix_Makefile_in
+++ b/package/tcl/patches/patch-unix_Makefile_in
@@ -1,5 +1,5 @@
---- tcl8.5.8.orig/unix/Makefile.in 2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/Makefile.in 2009-11-20 21:59:51.000000000 +0100
+--- tcl8.5.9.orig/unix/Makefile.in 2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/Makefile.in 2014-01-20 11:13:05.000000000 +0100
@@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
@@ -10,7 +10,7 @@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -745,7 +746,7 @@ install-binaries: binaries
+@@ -737,7 +738,7 @@ install-binaries: binaries
fi
@EXTRA_INSTALL_BINARIES@
diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure
index 393c2b45e..380b8d591 100644
--- a/package/tcl/patches/patch-unix_configure
+++ b/package/tcl/patches/patch-unix_configure
@@ -1,6 +1,6 @@
---- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100
-@@ -7968,9 +7968,6 @@ fi
+--- tcl8.5.9.orig/unix/configure 2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/configure 2014-01-20 11:13:05.000000000 +0100
+@@ -7983,9 +7983,6 @@ fi
LD_SEARCH_FLAGS=""
LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
@@ -10,7 +10,7 @@
PLAT_OBJS='${MAC_OSX_OBJS}'
PLAT_SRCS='${MAC_OSX_SRCS}'
-@@ -17646,11 +17643,6 @@ _ACEOF
+@@ -17578,11 +17575,6 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
@@ -22,7 +22,7 @@
#define TCL_WIDE_CLICKS 1
_ACEOF
-@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html'
+@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html'
# AIX remembers this path and will attempt to use it at run-time to look
# up the Tcl library.