tk: upgrade 8.6.0 -> 8.6.4

update content of non-linux.diff

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Li xin 2015-08-03 12:14:33 +08:00 committed by Martin Jansa
parent eaf6a6bc51
commit bb0bb692d3
7 changed files with 4 additions and 22 deletions

View File

@ -3,7 +3,7 @@ building on non-linux Debian architectures.
--- tk8.5-8.5.8.orig/unix/configure
+++ tk8.5-8.5.8/unix/configure
@@ -4742,6 +4742,9 @@
@@ -4447,6 +4447,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@ -12,16 +12,7 @@ building on non-linux Debian architectures.
+ fi
fi
fi
@@ -5546,7 +5549,7 @@
fi
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
--- tk8.5-8.5.8.orig/unix/tcl.m4
+++ tk8.5-8.5.8/unix/tcl.m4
@@ -962,6 +962,9 @@
@ -34,12 +25,3 @@ building on non-linux Debian architectures.
fi
fi
])
@@ -1422,7 +1425,7 @@
])
])
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"

View File

@ -26,8 +26,8 @@ SRC_URI = "\
file://fix-xft.diff \
file://configure.use.fontconfig.with.xft.patch \
"
SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8"
SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6"
SRC_URI[md5sum] = "261754d7dc2a582f00e35547777e1fea"
SRC_URI[sha256sum] = "08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1"
S = "${WORKDIR}/${BPN}${PV}/unix"