From f693dcdbfc044f75819dd7f6e72d556b944efeeb Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Thu, 9 Feb 2017 14:04:54 -0600 Subject: zsh: update to 5.3.1 --- meta-oe/recipes-extended/zsh/zsh_5.3.1.bb | 138 ++++++++++++++++++++++++++++++ meta-oe/recipes-extended/zsh/zsh_5.3.bb | 136 ----------------------------- 2 files changed, 138 insertions(+), 136 deletions(-) create mode 100644 meta-oe/recipes-extended/zsh/zsh_5.3.1.bb delete mode 100644 meta-oe/recipes-extended/zsh/zsh_5.3.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb b/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb new file mode 100644 index 0000000000..4a541d9bba --- /dev/null +++ b/meta-oe/recipes-extended/zsh/zsh_5.3.1.bb @@ -0,0 +1,138 @@ +SUMMARY = "UNIX Shell similar to the Korn shell" +DESCRIPTION = "Zsh is a shell designed for interactive use, although it is also a \ + powerful scripting language. Many of the useful features of bash, \ + ksh, and tcsh were incorporated into zsh; many original features were added." +HOMEPAGE = "http://www.zsh.org" +SECTION = "base/shell" + +LICENSE = "zsh" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e" + +DEPENDS = "ncurses bison-native libcap groff-native" + +SRC_URI = " \ + http://www.zsh.org/pub/zsh-${PV}.tar.xz;name=zsh \ + http://www.zsh.org/pub/zsh-${PV}-doc.tar.xz;name=zsh-docs \ + file://pcre-pkgconfig.patch \ + file://zsh_profile.sh \ + file://dot.zshrc \ +" + +SRC_URI[zsh.md5sum] = "67d3e5ed99de68340c16aef613b0ecf7" +SRC_URI[zsh.sha256sum] = "fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da" +SRC_URI[zsh-docs.md5sum] = "6b908409528e77e00a26b7283f1f425d" +SRC_URI[zsh-docs.sha256sum] = "d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed" + +inherit autotools gettext update-alternatives pkgconfig + +PACKAGECONFIG ??= "static \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +" + +PACKAGECONFIG[static] = "--disable-dynamic,--enable-dynamic,," +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[maildir] = "--enable-maildir-support,--disable-maildir-support,," +PACKAGECONFIG[nls] = "--enable-locale,--disable-locale,," +PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre," +PACKAGECONFIG[gdbm] = "--enable-gdbm,--disable-gdbm,gdbm," +PACKAGECONFIG[secure] = "--enable-zsh-mem --enable-zsh-secure-free,--disable-zsh-mem --disable-zsh-secure-free,," + +CACHED_CONFIGUREVARS = " zsh_cv_shared_environ=yes " + +EXTRA_OECONF = " \ + --bindir=${base_bindir} \ + --enable-etcdir=${sysconfdir} \ + --enable-fndir=${datadir}/${BPN}/${PV}/functions \ + --enable-site-fndir=${datadir}/${BPN}/site-functions \ + --with-term-lib='ncursesw ncurses' \ + --with-tcsetpgrp \ + --enable-cap \ + --enable-multibyte \ +" + +EXTRA_OECONF_append_libc-musl = " --enable-libc-musl " + +EXTRA_OEMAKE += " LLIST='-Wl,-rpath=${libdir}/${BPN}' " + +ALTERNATIVE_${PN} = "sh" +ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" +ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" +ALTERNATIVE_PRIORITY = "80" + +export AUTOHEADER = "true" + +do_configure () { + (cd ${S}; autoconf -I ${ACLOCALDIR} -I ${STAGING_DATADIR_NATIVE}/aclocal ; autoheader -f -I ${ACLOCALDIR} -I ${STAGING_DATADIR_NATIVE}/aclocal) + touch ${S}/stamp-h.in + oe_runconf +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install.bin install.modules install.fns install.runhelp + oe_runmake 'DESTDIR=${D}' install.man || true + + # Info dir listing isn't interesting at this point so remove it if it exists. + if [ -e "${D}${infodir}/dir" ]; then + rm -f ${D}${infodir}/dir + fi + + # Remove versioned zsh binary + rm -f ${D}${base_bindir}/${BPN}-${PV} || true + + # Set up restricted shells + ln -sf ${BPN} ${D}${base_bindir}/rzsh + + # install etc files + install -d ${D}${sysconfdir}/profile.d + install -m 0644 ${WORKDIR}/zsh_profile.sh ${D}${sysconfdir}/profile.d + install -d ${D}${sysconfdir}/skel + install -m 0644 ${WORKDIR}/dot.zshrc ${D}${sysconfdir}/skel/.zshrc + + # install configuration examples + install -d ${D}${datadir}/examples/${BPN} + install -m 644 ${S}/StartupFiles/* ${D}${datadir}/examples/${BPN} +} + +pkg_postinst_${PN} () { + grep -q "^${base_bindir}/zsh$" $D${sysconfdir}/shells || echo ${base_bindir}/zsh >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${base_bindir}/zsh$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} + +PACKAGES =+ "${PN}-examples ${PN}-functions" + +FILES_${PN}-examples += "${datadir}/examples/${BPN}/*" + +FILES_${PN}-functions += " \ + ${datadir}/${BPN}/${PV}/scripts \ + ${datadir}/${BPN}/${PV}/functions \ + ${datadir}/${BPN}/site-functions \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/${BPN}/.debug/*.so \ + ${libdir}/${BPN}/${PV}/zsh/.debug/*.so \ + ${libdir}/${BPN}/${PV}/zsh/db/.debug/*.so \ + ${libdir}/${BPN}/${PV}/zsh/net/.debug/*.so \ + ${libdir}/${BPN}/${PV}/zsh/param/.debug/*.so \ +" + +FILES_${PN}-doc += "\ + ${datadir}/${BPN}/${PV}/help \ + ${datadir}/${BPN}/${PV}/help/* \ +" + +FILES_${PN} += "\ + ${libdir}/${BPN}/*.so \ + ${libdir}/${BPN}/${PV}/zsh/*.so \ + ${libdir}/${BPN}/${PV}/zsh/db/*.so \ + ${libdir}/${BPN}/${PV}/zsh/net/*.so \ + ${libdir}/${BPN}/${PV}/zsh/param/*.so \ +" + +RDEPENDS_${PN}-functions += "${PN}" +RDEPENDS_${PN}-examples += "${PN}" +RRECOMMENDS_${PN} += "${PN}-functions" +RRECOMMENDS_${PN}-doc += "${PN}-examples" diff --git a/meta-oe/recipes-extended/zsh/zsh_5.3.bb b/meta-oe/recipes-extended/zsh/zsh_5.3.bb deleted file mode 100644 index dabdcfb850..0000000000 --- a/meta-oe/recipes-extended/zsh/zsh_5.3.bb +++ /dev/null @@ -1,136 +0,0 @@ -SUMMARY = "UNIX Shell similar to the Korn shell" -DESCRIPTION = "Zsh is a shell designed for interactive use, although it is also a \ - powerful scripting language. Many of the useful features of bash, \ - ksh, and tcsh were incorporated into zsh; many original features were added." -HOMEPAGE = "http://www.zsh.org" -SECTION = "base/shell" - -LICENSE = "zsh" -LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e" - -DEPENDS = "ncurses bison-native libcap groff-native" - -SRC_URI = " \ - http://www.zsh.org/pub/zsh-${PV}.tar.xz;name=zsh \ - http://www.zsh.org/pub/zsh-${PV}-doc.tar.xz;name=zsh-docs \ - file://pcre-pkgconfig.patch \ - file://zsh_profile.sh \ - file://dot.zshrc \ -" - -SRC_URI[zsh.md5sum] = "c5ba34e68fcf62a2e78adc56bf3d328a" -SRC_URI[zsh.sha256sum] = "76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a" -SRC_URI[zsh-docs.md5sum] = "12c35fff5b1b902a5a81ab79cb9c3da6" -SRC_URI[zsh-docs.sha256sum] = "cdfc6c3f7235b13308af5316cfa87abb5f51b3ec72d45f9043fde6e5b2e8663e" - -inherit autotools gettext update-alternatives pkgconfig - -PACKAGECONFIG ??= "static \ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ -" - -PACKAGECONFIG[static] = "--disable-dynamic,--enable-dynamic,," -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[maildir] = "--enable-maildir-support,--disable-maildir-support,," -PACKAGECONFIG[nls] = "--enable-locale,--disable-locale,," -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre," -PACKAGECONFIG[gdbm] = "--enable-gdbm,--disable-gdbm,gdbm," -PACKAGECONFIG[secure] = "--enable-zsh-mem --enable-zsh-secure-free,--disable-zsh-mem --disable-zsh-secure-free,," - -CACHED_CONFIGUREVARS = " zsh_cv_shared_environ=yes " - -EXTRA_OECONF = " \ - --bindir=${base_bindir} \ - --enable-etcdir=${sysconfdir} \ - --enable-fndir=${datadir}/${BPN}/${PV}/functions \ - --enable-site-fndir=${datadir}/${BPN}/site-functions \ - --with-term-lib='ncursesw ncurses' \ - --with-tcsetpgrp \ - --enable-cap \ - --enable-multibyte \ -" - -EXTRA_OECONF_append_libc-musl = " --enable-libc-musl " - -EXTRA_OEMAKE += " LLIST='-Wl,-rpath=${libdir}/${BPN}' " - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" -ALTERNATIVE_PRIORITY = "80" - -export AUTOHEADER = "true" - -do_configure () { - (cd ${S}; autoconf -I ${ACLOCALDIR} -I ${STAGING_DATADIR_NATIVE}/aclocal ; autoheader -f -I ${ACLOCALDIR} -I ${STAGING_DATADIR_NATIVE}/aclocal) - touch ${S}/stamp-h.in - oe_runconf -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install.bin install.modules install.fns install.runhelp - oe_runmake 'DESTDIR=${D}' install.man || true - - # Info dir listing isn't interesting at this point so remove it if it exists. - if [ -e "${D}${infodir}/dir" ]; then - rm -f ${D}${infodir}/dir - fi - - # Remove versioned zsh binary - rm -f ${D}${base_bindir}/${BPN}-${PV} || true - - # Set up restricted shells - ln -sf ${BPN} ${D}${base_bindir}/rzsh - - # install etc files - install -d ${D}${sysconfdir}/profile.d - install -m 0644 ${WORKDIR}/zsh_profile.sh ${D}${sysconfdir}/profile.d - install -d ${D}${sysconfdir}/skel - install -m 0644 ${WORKDIR}/dot.zshrc ${D}${sysconfdir}/skel/.zshrc - - # install configuration examples - install -d ${D}${datadir}/examples/${BPN} - install -m 644 ${S}/StartupFiles/* ${D}${datadir}/examples/${BPN} -} - -pkg_postinst_${PN} () { - grep -q "^${base_bindir}/zsh$" $D${sysconfdir}/shells || echo ${base_bindir}/zsh >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${base_bindir}/zsh$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} - -PACKAGES =+ "${PN}-examples ${PN}-functions" - -FILES_${PN}-examples += "${datadir}/examples/${BPN}/*" - -FILES_${PN}-functions += " \ - ${datadir}/${BPN}/${PV}/scripts \ - ${datadir}/${BPN}/${PV}/functions \ - ${datadir}/${BPN}/site-functions \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/${BPN}/.debug/*.so \ - ${libdir}/${BPN}/${PV}/zsh/.debug/*.so \ - ${libdir}/${BPN}/${PV}/zsh/db/.debug/*.so \ - ${libdir}/${BPN}/${PV}/zsh/net/.debug/*.so \ - ${libdir}/${BPN}/${PV}/zsh/param/.debug/*.so \ -" - -FILES_${PN}-doc += "\ - ${datadir}/${BPN}/${PV}/help \ - ${datadir}/${BPN}/${PV}/help/* \ -" - -FILES_${PN} += "\ - ${libdir}/${BPN}/*.so \ - ${libdir}/${BPN}/${PV}/zsh/*.so \ - ${libdir}/${BPN}/${PV}/zsh/db/*.so \ - ${libdir}/${BPN}/${PV}/zsh/net/*.so \ - ${libdir}/${BPN}/${PV}/zsh/param/*.so \ -" - -RRECOMMENDS_${PN} += "${PN}-functions" -RRECOMMENDS_${PN}-doc += "${PN}-examples" -- cgit 1.2.3-korg