From 8fe11788cbd8f7dffb6988b3b419141a052d45bd Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Sat, 28 Apr 2007 11:06:29 +0000 Subject: Fix ruby exit status svn path=/; revision=14 --- dev-lang/ruby/files/ruby-1.8.6-exit-status.patch | 80 ++++++++++ dev-lang/ruby/ruby-1.8.6-r1.ebuild | 176 ---------------------- dev-lang/ruby/ruby-1.8.6-r2.ebuild | 178 +++++++++++++++++++++++ 3 files changed, 258 insertions(+), 176 deletions(-) create mode 100644 dev-lang/ruby/files/ruby-1.8.6-exit-status.patch delete mode 100644 dev-lang/ruby/ruby-1.8.6-r1.ebuild create mode 100644 dev-lang/ruby/ruby-1.8.6-r2.ebuild diff --git a/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch b/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch new file mode 100644 index 0000000..a86587f --- /dev/null +++ b/dev-lang/ruby/files/ruby-1.8.6-exit-status.patch @@ -0,0 +1,80 @@ +Index: test/ruby/test_beginendblock.rb +=================================================================== +--- test/ruby/test_beginendblock.rb (revision 12125) ++++ test/ruby/test_beginendblock.rb (revision 12126) +@@ -54,4 +54,34 @@ + assert_equal(expected, File.read(erroutpath)) + # expecting Tempfile to unlink launcher and errout file. + end ++ ++ def test_raise_in_at_exit ++ # [ruby-core:09675] ++ ruby = EnvUtil.rubybin ++ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \ ++ "at_exit{raise %[SomethingBad]};" \ ++ "raise %[SomethingElse]'") {|f| ++ f.read ++ } ++ assert_match /SomethingBad/, out ++ assert_match /SomethingElse/, out ++ end ++ ++ def test_should_propagate_exit_code ++ ruby = EnvUtil.rubybin ++ assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'") ++ assert_equal 2, $?.exitstatus ++ assert_nil $?.termsig ++ end ++ ++ def test_should_propagate_signaled ++ ruby = EnvUtil.rubybin ++ out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \ ++ "at_exit{Process.kill(:INT, $$)}'"){|f| ++ f.read ++ } ++ assert_match /Interrupt$/, out ++ assert_nil $?.exitstatus ++ assert_equal Signal.list["INT"], $?.termsig ++ end + end +Index: eval.c +=================================================================== +--- eval.c (revision 12125) ++++ eval.c (revision 12126) +@@ -1562,11 +1562,15 @@ + int ex; + { + int state; +- volatile VALUE err = ruby_errinfo; ++ VALUE err; ++ volatile VALUE errs[2]; ++ int nerr; + ++ errs[0] = ruby_errinfo; + ruby_safe_level = 0; + Init_stack((void*)&state); + ruby_finalize_0(); ++ errs[1] = ruby_errinfo; + PUSH_TAG(PROT_NONE); + PUSH_ITER(ITER_NOT); + if ((state = EXEC_TAG()) == 0) { +@@ -1577,15 +1581,15 @@ + ex = state; + } + POP_ITER(); +- ruby_errinfo = err; ++ ruby_errinfo = errs[0]; + ex = error_handle(ex); + ruby_finalize_1(); + POP_TAG(); + +- if (err) { ++ for (nerr = sizeof(errs) / sizeof(errs[0]); nerr;) { ++ if (!(err = errs[--nerr])) continue; + if (rb_obj_is_kind_of(err, rb_eSystemExit)) { +- VALUE st = rb_iv_get(err, "status"); +- return NUM2INT(st); ++ return sysexit_status(err); + } + else if (rb_obj_is_kind_of(err, rb_eSignal)) { + VALUE sig = rb_iv_get(err, "signo"); diff --git a/dev-lang/ruby/ruby-1.8.6-r1.ebuild b/dev-lang/ruby/ruby-1.8.6-r1.ebuild deleted file mode 100644 index 7d1b44e..0000000 --- a/dev-lang/ruby/ruby-1.8.6-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6.ebuild,v 1.2 2007/04/07 16:23:57 pclouds Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -# A new version is needed for 1.8.6, currently disabled. -ONIGURUMA="onigd2_5_8" - -inherit flag-o-matic alternatives eutils multilib autotools versionator - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${P}.tar.gz" -# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" - -LICENSE="Ruby" -SLOT="1.8" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk" # cjk -RESTRICT="confcache" - -RDEPEND=">=sys-libs/gdbm-1.8.0 - >=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( dev-lang/tk ) - >=dev-ruby/ruby-config-0.3.1 - !=dev-lang/ruby-cvs-1.8* - !dev-ruby/rdoc - !dev-ruby/rexml" -DEPEND="${RDEPEND}" -PROVIDE="virtual/ruby" - -src_unpack() { - unpack ${A} - -# if use cjk ; then -# einfo "Applying ${ONIGURUMA}" -# pushd ${WORKDIR}/oniguruma -## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch -# econf --with-rubydir=${S} || die "econf failed" -# MY_PV=$(get_version_component_range 1-2) -# make ${MY_PV/./} -# popd -# fi - - cd "${S}" - - # Fix a hardcoded lib path in configure script - sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ - configure.in || die "sed failed" - - eautoreconf -} - -src_compile() { - # -fomit-frame-pointer makes ruby segfault, see bug #150413. - filter-flags -fomit-frame-pointer - # In many places aliasing rules are broken; play it safe - # as it's risky with newer compilers to leave it as it is. - append-flags -fno-strict-aliasing - - # Socks support via dante - if use socks5 ; then - # Socks support can't be disabled as long as SOCKS_SERVER is - # set and socks library is present, so need to unset - # SOCKS_SERVER in that case. - unset SOCKS_SERVER - fi - - # Increase GC_MALLOC_LIMIT if set (default is 8000000) - if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then - append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" - fi - - # Bug #168939 - # We need to always enable ipv6, use --with-lookup-order-hack=INET - # when we don't want ipv6 with glibc - if use elibc_glibc; then - myconf="--enable-ipv6" - if ! use ipv6; then - myconf="${myconf} --with-lookup-order-hack=INET" - fi - else - myconf=$(use_enable ipv6) - fi - - econf --program-suffix=${SLOT/./} --enable-shared \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - $(use_enable threads pthread) \ - $(use_enable debug debug) \ - ${myconf} \ - --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ - || die "econf failed" - - emake || die "emake failed" -} - -src_test() { - emake test || die "make test failed" - - elog "Ruby's make test has been run. Ruby also ships with a make check" - elog "that cannot be run until after ruby has been installed." - elog - if use rubytests; then - elog "You have enabled rubytests, so they will be installed to " - elog "/usr/share/ruby/test. To use them they must be writeable and " - elog "you must not be running as root. Call:" - elog - elog "ruby -C /location/of/tests runner.rb" - else - elog "Enable the rubytests USE flag to install the make check tests" - fi -} - -src_install() { - LD_LIBRARY_PATH=${D}/usr/$(get_libdir) - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" - for d in $(find ${S}/ext -type d) ; do - RUBYLIB="${RUBYLIB}:$d" - done - export LD_LIBRARY_PATH RUBYLIB - - make DESTDIR="${D}" install || die "make install failed" - - MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") - keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") - - if use doc; then - make DESTDIR="${D}" install-doc || die "make install-doc failed" - fi - - if use examples; then - dodir /usr/share/doc/${PF} - cp -pPR sample ${D}/usr/share/doc/${PF} - fi - - dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) - dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) - - dodoc ChangeLog NEWS README* ToDo - - if use rubytests; then - dodir /usr/share/${PN} - cp -pPR test ${D}/usr/share/${PN} - fi -} - -pkg_postinst() { - ewarn - ewarn "Warning: Vim won't work if you've just updated ruby from" - ewarn "1.6.x to 1.8.x due to the library version change." - ewarn "In that case, you will need to remerge vim." - ewarn - - ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," - ewarn "you should re-emerge ruby again." - ewarn "See bug #159922 for details" - ewarn - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi - elog - elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" - elog -} - -pkg_postrm() { - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi -} diff --git a/dev-lang/ruby/ruby-1.8.6-r2.ebuild b/dev-lang/ruby/ruby-1.8.6-r2.ebuild new file mode 100644 index 0000000..29135ea --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.6-r2.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6.ebuild,v 1.2 2007/04/07 16:23:57 pclouds Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +# A new version is needed for 1.8.6, currently disabled. +ONIGURUMA="onigd2_5_8" + +inherit flag-o-matic alternatives eutils multilib autotools versionator + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${P}.tar.gz" +# cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" + +LICENSE="Ruby" +SLOT="1.8" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk" # cjk +RESTRICT="confcache" + +RDEPEND=">=sys-libs/gdbm-1.8.0 + >=sys-libs/readline-4.1 + >=sys-libs/ncurses-5.2 + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( dev-lang/tk ) + >=dev-ruby/ruby-config-0.3.1 + !=dev-lang/ruby-cvs-1.8* + !dev-ruby/rdoc + !dev-ruby/rexml" +DEPEND="${RDEPEND}" +PROVIDE="virtual/ruby" + +src_unpack() { + unpack ${A} + +# if use cjk ; then +# einfo "Applying ${ONIGURUMA}" +# pushd ${WORKDIR}/oniguruma +## epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch +# econf --with-rubydir=${S} || die "econf failed" +# MY_PV=$(get_version_component_range 1-2) +# make ${MY_PV/./} +# popd +# fi + + cd "${S}" + + # Fix a hardcoded lib path in configure script + sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ + configure.in || die "sed failed" + + eautoreconf + + epatch ${FILESDIR}/${P}-exit-status.patch +} + +src_compile() { + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # Bug #168939 + # We need to always enable ipv6, use --with-lookup-order-hack=INET + # when we don't want ipv6 with glibc + if use elibc_glibc; then + myconf="--enable-ipv6" + if ! use ipv6; then + myconf="${myconf} --with-lookup-order-hack=INET" + fi + else + myconf=$(use_enable ipv6) + fi + + econf --program-suffix=${SLOT/./} --enable-shared \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + $(use_enable threads pthread) \ + $(use_enable debug debug) \ + ${myconf} \ + --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ + || die "econf failed" + + emake || die "emake failed" +} + +src_test() { + emake test || die "make test failed" + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to " + elog "/usr/share/ruby/test. To use them they must be writeable and " + elog "you must not be running as root. Call:" + elog + elog "ruby -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + LD_LIBRARY_PATH=${D}/usr/$(get_libdir) + RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" + for d in $(find ${S}/ext -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + make DESTDIR="${D}" install || die "make install failed" + + MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']") + keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']") + + if use doc; then + make DESTDIR="${D}" install-doc || die "make install-doc failed" + fi + + if use examples; then + dodir /usr/share/doc/${PF} + cp -pPR sample ${D}/usr/share/doc/${PF} + fi + + dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) + dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) + + dodoc ChangeLog NEWS README* ToDo + + if use rubytests; then + dodir /usr/share/${PN} + cp -pPR test ${D}/usr/share/${PN} + fi +} + +pkg_postinst() { + ewarn + ewarn "Warning: Vim won't work if you've just updated ruby from" + ewarn "1.6.x to 1.8.x due to the library version change." + ewarn "In that case, you will need to remerge vim." + ewarn + + ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1," + ewarn "you should re-emerge ruby again." + ewarn "See bug #159922 for details" + ewarn + if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then + ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} + fi + elog + elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" + elog +} + +pkg_postrm() { + if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then + ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} + fi +} -- cgit v1.2.3-65-gdbad