From ec9327e23868e510ea243bbc21ebdf896b4603fe Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Tue, 1 Dec 2020 10:18:13 +0800 Subject: tcsh: upgrade 6.22.02 -> 6.22.03 0001-Remove-defining-handle_interrupt-twice.patch Removed since this is included in 6.22.03. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- ...01-Remove-defining-handle_interrupt-twice.patch | 28 -------------- meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb | 45 ---------------------- meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb | 44 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 73 deletions(-) delete mode 100644 meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch delete mode 100644 meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb create mode 100644 meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb (limited to 'meta-oe/recipes-shells') diff --git a/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch b/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch deleted file mode 100644 index d6d6ae06de..0000000000 --- a/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2c77b61506aa867a873e3691214983b3eb7f652d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Aug 2020 19:49:35 -0700 -Subject: [PATCH] Remove defining handle_interrupt twice - -Fixes build with -fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - tc.sig.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tc.sig.c b/tc.sig.c -index 77659ca..576605a 100644 ---- a/tc.sig.c -+++ b/tc.sig.c -@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ - int phup_disabled; /* = 0; */ - int pchild_disabled; /* = 0; */ - int pintr_disabled; /* = 0; */ --int handle_interrupt; /* = 0; */ - - int - handle_pending_signals(void) --- -2.28.0 - diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb deleted file mode 100644 index 541f5505f3..0000000000 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ - It includes all features of 4.4BSD C shell, plus a command-line editor, \ - programmable word completion, spelling correction and more." - -HOMEPAGE = "http://www.tcsh.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" -SECTION = "base" -DEPENDS = "ncurses virtual/crypt gettext-native" -SRC_URI = " \ - https://astron.com/pub/${BPN}/${BP}.tar.gz \ - file://0001-Enable-system-malloc-on-all-linux.patch \ - file://0002-Add-debian-csh-scripts.patch \ - file://0001-Remove-defining-handle_interrupt-twice.patch \ -" -SRC_URI[md5sum] = "f34909eab33733aecc05d27adc82277b" -SRC_URI[sha256sum] = "ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b" - -EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" -inherit autotools - -do_compile_prepend() { - oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost -} - -do_install_append () { - oe_runmake install.man DESTDIR=${D} - - install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - ln -s /usr/bin/tcsh ${D}${base_bindir}/csh - install -d ${D}${sysconfdir}/csh/login.d - install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} - install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el -} - -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" - - -pkg_postinst_${PN} () { -#!/bin/sh -e -echo /usr/bin/tcsh >> $D/etc/shells -echo /usr/bin/csh >> $D/etc/shells -} diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb new file mode 100644 index 0000000000..fab626c61c --- /dev/null +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.03.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ + The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ + It includes all features of 4.4BSD C shell, plus a command-line editor, \ + programmable word completion, spelling correction and more." + +HOMEPAGE = "http://www.tcsh.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" +SECTION = "base" +DEPENDS = "ncurses virtual/crypt gettext-native" +SRC_URI = " \ + https://astron.com/pub/${BPN}/${BP}.tar.gz \ + file://0001-Enable-system-malloc-on-all-linux.patch \ + file://0002-Add-debian-csh-scripts.patch \ +" +SRC_URI[md5sum] = "c9387b7c8cf958956e75b1fa4e59b612" +SRC_URI[sha256sum] = "be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7" + +EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" +inherit autotools + +do_compile_prepend() { + oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost +} + +do_install_append () { + oe_runmake install.man DESTDIR=${D} + + install -d ${D}${base_bindir} + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + install -d ${D}${sysconfdir}/csh/login.d + install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} + install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el +} + +FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" + + +pkg_postinst_${PN} () { +#!/bin/sh -e +echo /usr/bin/tcsh >> $D/etc/shells +echo /usr/bin/csh >> $D/etc/shells +} -- cgit v1.2.3-54-g00ecf