Mercurial > gub
changeset 6302:9e36a36de8a9
Merge branch 'fix-librestrict' into gcc-4.8
| author | Masamichi Hosoda <trueroad@users.noreply.github.com> |
|---|---|
| date | Sun, 04 Jan 2015 18:02:41 +0900 |
| parents | 32141cc8bd63 (current diff) 6695d3a8e046 (diff) |
| children | 6a3d8fd0254d |
| files | gub/specs/gmp.py |
| diffstat | 5 files changed, 12 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/debian.py Sun Jan 04 17:51:24 2015 +0900 +++ b/gub/debian.py Sun Jan 04 18:02:41 2015 +0900 @@ -12,13 +12,13 @@ # http://ftp.de.debian.org/debian/pool/main/l/linux-kernel-headers/ -gcc_version = '4.1.1' +gcc_version = '4.8.2' glibc_version='2.3.2.ds1-22sarge4' linux_version = '2.5.999-test7-bk-17' def get_cross_build_dependencies (settings): global gcc_version, glibc_version, linux_version #FIXME too late - gcc_version = '4.1.1' + gcc_version = '4.8.2' if settings.debian_branch == 'stable': glibc_version='2.3.2.ds1-22sarge4' linux_version = '2.5.999-test7-bk-17'
--- a/gub/specs/cygwin/gmp.py Sun Jan 04 17:51:24 2015 +0900 +++ b/gub/specs/cygwin/gmp.py Sun Jan 04 18:02:41 2015 +0900 @@ -4,7 +4,7 @@ from gub.specs import gmp class Gmp (gmp.Gmp): - source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.1.4.tar.gz' - patches = ['gmp-4.1.4-1.patch'] + source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.1.tar.gz' + patches = [] dependencies = gup.gub_to_distro_deps (gmp.Gmp.dependencies, cygwin.gub_to_distro_dict)
--- a/gub/specs/gmp.py Sun Jan 04 17:51:24 2015 +0900 +++ b/gub/specs/gmp.py Sun Jan 04 18:02:41 2015 +0900 @@ -6,7 +6,7 @@ from gub import tools class Gmp (target.AutoBuild): - source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-5.1.3.tar.gz' + source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz' def __init__ (self, settings, source): target.AutoBuild.__init__ (self, settings, source) if not self.settings.platform.startswith ('darwin'):
--- a/gub/specs/mpfr.py Sun Jan 04 17:51:24 2015 +0900 +++ b/gub/specs/mpfr.py Sun Jan 04 18:02:41 2015 +0900 @@ -1,5 +1,5 @@ from gub import tools class Mpfr__tools (tools.AutoBuild): - source = 'http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.gz' + source = 'http://www.mpfr.org/mpfr-2.4.2/mpfr-2.4.2.tar.gz' dependencies = ['libtool', 'gmp']
--- a/librestrict/xstatconv.c Sun Jan 04 17:51:24 2015 +0900 +++ b/librestrict/xstatconv.c Sun Jan 04 18:02:41 2015 +0900 @@ -48,20 +48,16 @@ { struct stat *buf = ubuf; + /* zero clear */ + memset(buf, 0, sizeof(*buf)); /* Convert to current kernel version of `struct stat'. */ buf->st_dev = kbuf->st_dev; -#ifdef _HAVE_STAT___PAD1 - buf->__pad1 = 0; -#endif buf->st_ino = kbuf->st_ino; buf->st_mode = kbuf->st_mode; buf->st_nlink = kbuf->st_nlink; buf->st_uid = kbuf->st_uid; buf->st_gid = kbuf->st_gid; buf->st_rdev = kbuf->st_rdev; -#ifdef _HAVE_STAT___PAD2 - buf->__pad2 = 0; -#endif buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; @@ -77,21 +73,6 @@ buf->st_mtime = kbuf->st_mtime; buf->st_ctime = kbuf->st_ctime; #endif -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED4 - buf->__unused4 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED5 - buf->__unused5 = 0; -#endif } break; @@ -116,11 +97,10 @@ { struct stat64 *buf = ubuf; + /* zero clear */ + memset(buf, 0, sizeof(*buf)); /* Convert to current kernel version of `struct stat64'. */ buf->st_dev = kbuf->st_dev; -#ifdef _HAVE_STAT64___PAD1 - buf->__pad1 = 0; -#endif buf->st_ino = kbuf->st_ino; #ifdef _HAVE_STAT64___ST_INO buf->__st_ino = kbuf->st_ino; @@ -130,9 +110,6 @@ buf->st_uid = kbuf->st_uid; buf->st_gid = kbuf->st_gid; buf->st_rdev = kbuf->st_rdev; -#ifdef _HAVE_STAT64___PAD2 - buf->__pad2 = 0; -#endif buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; @@ -148,21 +125,6 @@ buf->st_mtime = kbuf->st_mtime; buf->st_ctime = kbuf->st_ctime; #endif -#ifdef _HAVE_STAT64___UNUSED1 - buf->__unused1 = 0; -#endif -#ifdef _HAVE_STAT64___UNUSED2 - buf->__unused2 = 0; -#endif -#ifdef _HAVE_STAT64___UNUSED3 - buf->__unused3 = 0; -#endif -#ifdef _HAVE_STAT64___UNUSED4 - buf->__unused4 = 0; -#endif -#ifdef _HAVE_STAT64___UNUSED5 - buf->__unused5 = 0; -#endif } break; @@ -185,12 +147,11 @@ { case _STAT_VER_LINUX: { + /* zero clear */ + memset(buf, 0, sizeof(*buf)); /* Convert current kernel version of `struct stat64' to `struct stat'. */ buf->st_dev = kbuf->st_dev; -#ifdef _HAVE_STAT___PAD1 - buf->__pad1 = 0; -#endif #ifdef _HAVE_STAT64___ST_INO # if __ASSUME_ST_INO_64_BIT == 0 if (kbuf->st_ino == 0) @@ -220,9 +181,6 @@ buf->st_uid = kbuf->st_uid; buf->st_gid = kbuf->st_gid; buf->st_rdev = kbuf->st_rdev; -#ifdef _HAVE_STAT___PAD2 - buf->__pad2 = 0; -#endif buf->st_size = kbuf->st_size; /* Check for overflow. */ if (sizeof (buf->st_size) != sizeof (kbuf->st_size) @@ -253,21 +211,6 @@ buf->st_ctime = kbuf->st_ctime; #endif -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED4 - buf->__unused4 = 0; -#endif -#ifdef _HAVE_STAT___UNUSED5 - buf->__unused5 = 0; -#endif } break;