Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24a4bd354bc6aac99acb817a1d7a7b1510588b4a
commit 24a4bd354bc6aac99acb817a1d7a7b1510588b4a Author: crazy <[email protected]> Date: Sun May 22 17:02:35 2016 +0200 tcsh-6.19.00-4-x86_64 * added patches to fix issues with gcc>=5.X diff --git a/source/apps/tcsh/FrugalBuild b/source/apps/tcsh/FrugalBuild index 4a77adb..55d0918 100644 --- a/source/apps/tcsh/FrugalBuild +++ b/source/apps/tcsh/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tcsh pkgver=6.19.00 -pkgrel=3 +pkgrel=4 pkgdesc="Enhanced version of the Berkeley C shell" url="http://www.tcsh.org/Welcome"; depends=('ncurses>=6.0-6') @@ -11,13 +11,16 @@ groups=('apps') archs=('i686' 'x86_64' 'arm') backup=(etc/csh.login) up2date="lynx -dump ftp://ftp.astron.com/pub/tcsh/|Flasttar" -source=(ftp://ftp.astron.com/pub/tcsh/tcsh-$pkgver.tar.gz csh.login) -install=$pkgname.install +source=(ftp://ftp.astron.com/pub/tcsh/tcsh-$pkgver.tar.gz csh.login gcc5-1.patch gcc5-2.patch) +options+=('scriptlet') sha1sums=('cdb1abe319fab5d3caff101c393293e5b3607f0c' \ - '12e65f08c100171fcaa70e78737cf95a8f6fa49f') + '12e65f08c100171fcaa70e78737cf95a8f6fa49f' \ + 'd582d56f156b07aa9c605709d1d1e863dad3bb3f' \ + 'a7633f29994c8a0dbd4ab92638a8aecf4225ec47') build() { + Fpatchall Fmake --prefix=/ --datarootdir=/usr/share Fmakeinstall DESTMAN=$Fdestdir/usr/share/man/man1 install.man Ffile /etc/csh.login diff --git a/source/apps/tcsh/gcc5-1.patch b/source/apps/tcsh/gcc5-1.patch new file mode 100644 index 0000000..a8b2aac --- /dev/null +++ b/source/apps/tcsh/gcc5-1.patch @@ -0,0 +1,31 @@ +From 624d3aebb6e6afadb4f35e894d11b5ebe290cd87 Mon Sep 17 00:00:00 2001 +From: christos <christos> +Date: Thu, 28 May 2015 11:47:03 +0000 +Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin + Pokorny) + +--- + tc.alloc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tc.alloc.c b/tc.alloc.c +index b9aec63..c1cb330 100644 +--- a/tc.alloc.c ++++ b/tc.alloc.c +@@ -348,10 +348,13 @@ calloc(size_t i, size_t j) + { + #ifndef lint + char *cp; ++ size_t k; + + i *= j; + cp = xmalloc(i); +- memset(cp, 0, i); ++ /* Stop gcc 5.x from optimizing malloc+memset = calloc */ ++ k = i; ++ memset(cp, 0, k); + + return ((memalign_t) cp); + #else +-- +2.4.5 diff --git a/source/apps/tcsh/gcc5-2.patch b/source/apps/tcsh/gcc5-2.patch new file mode 100644 index 0000000..624ab25 --- /dev/null +++ b/source/apps/tcsh/gcc5-2.patch @@ -0,0 +1,25 @@ +From 05e7406049bd2686dee0ee8d819dcd38eb131f6f Mon Sep 17 00:00:00 2001 +From: christos <christos> +Date: Tue, 7 Jul 2015 12:24:54 +0000 +Subject: [PATCH] make k volatile to prevent gcc-5 memset() optimization + (Fridolin Pokorny) + +--- + tc.alloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tc.alloc.c b/tc.alloc.c +index c1cb330..f68a8c5 100644 +--- a/tc.alloc.c ++++ b/tc.alloc.c +@@ -348,7 +348,7 @@ calloc(size_t i, size_t j) + { + #ifndef lint + char *cp; +- size_t k; ++ volatile size_t k; + + i *= j; + cp = xmalloc(i); +-- +2.4.5 \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
