diff options
| author |   Derek Straka <derek@asterius.io> | 2016-06-08 14:22:50 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-15 12:13:16 +0200 |
| commit | 47e84b36863c0084e640422ea7d0e16b39ab8d99 (patch) | |
| tree | d9a982a1d20004cc6fc4210e187f73d428ac939a | |
| parent | 87fc6bb63978e95839c1efeb072d851f6ee3c907 (diff) | |
| download | meta-openembedded-contrib-47e84b36863c0084e640422ea7d0e16b39ab8d99.tar.gz | |
tcsh: fix the wait definition to support gcc6
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/dt/dt_18.32.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 13 |
3 files changed, 18 insertions, 8 deletions
diff --git a/meta-oe/recipes-devtools/dt/dt_18.32.bb b/meta-oe/recipes-devtools/dt/dt_18.32.bb index d472fab8cc..9688d02aac 100644 --- a/meta-oe/recipes-devtools/dt/dt_18.32.bb +++ b/meta-oe/recipes-devtools/dt/dt_18.32.bb @@ -45,5 +45,3 @@ do_install() { } RDEPENDS_${PN} += "tcsh" - -PNBLACKLIST[dt] ?= "Rdepends on broken tcsh" diff --git a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch b/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch new file mode 100644 index 0000000000..acc2ce93d7 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch @@ -0,0 +1,11 @@ +--- tcsh-6.18.01/sh.proc.c.orig 2016-06-08 16:11:02.902326725 +0000 ++++ tcsh-6.18.01/sh.proc.c 2016-06-08 16:38:22.150304901 +0000 +@@ -48,7 +48,7 @@ + #endif /* aiws */ + + #if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) +-# if !defined(__ANDROID__) ++# if !defined(__ANDROID__) && !defined(__GLIBC__) + # define BSDWAIT + # endif + #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb index 5a6f190617..d7a7fd4d41 100644 --- a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb @@ -10,7 +10,8 @@ SECTION = "base" DEPENDS = "ncurses gettext-native" SRC_URI = " \ ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \ + ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs2 \ + ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-5.diff.gz;name=diffs5 \ file://01_build.1.patch \ file://01_build.2.patch \ file://01_build.3.patch \ @@ -21,11 +22,14 @@ SRC_URI = " \ file://12_unknown_lscolors.patch \ file://tcsh-6.17.02-multibyte.patch \ file://disable-broken-test.patch \ + file://fix-gcc6-wait-union.patch \ " SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" -SRC_URI[diffs.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" -SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" +SRC_URI[diffs2.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" +SRC_URI[diffs2.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" +SRC_URI[diffs5.md5sum] = "d536c12a02dc48c332cc472b86927319" +SRC_URI[diffs5.sha256sum] = "7548d64bf996548bfbc13f3e0959fd2e8455f8375381a31da67d79554aabc7af" inherit autotools @@ -47,6 +51,3 @@ pkg_postinst_${PN} () { #!/bin/sh -e echo /usr/bin/tcsh >> $D/etc/shells } - -# http://errors.yoctoproject.org/Errors/Details/68619/ -PNBLACKLIST[tcsh] ?= "BROKEN: fails to build with glibc-2.24" |