From ef333c4f6eff3127105741b9ba1f85403d8b46ad Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 28 Jan 2009 13:05:33 +0000 Subject: Check that native exceptions are disabled in gnustep-make when using ffcall, they only work with libffi (Portage version: 2.2_rc23/cvs/Linux x86_64) --- gnustep-base/gnustep-base/ChangeLog | 11 ++- .../gnustep-base/gnustep-base-1.18.0-r1.ebuild | 78 ++++++++++++++++++++++ .../gnustep-base/gnustep-base-1.18.0.ebuild | 77 --------------------- 3 files changed, 87 insertions(+), 79 deletions(-) create mode 100644 gnustep-base/gnustep-base/gnustep-base-1.18.0-r1.ebuild delete mode 100644 gnustep-base/gnustep-base/gnustep-base-1.18.0.ebuild (limited to 'gnustep-base') diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog index 3674e26e8572..8d398e3c7d7e 100644 --- a/gnustep-base/gnustep-base/ChangeLog +++ b/gnustep-base/gnustep-base/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnustep-base/gnustep-base -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.80 2008/12/22 16:14:18 voyageur Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.81 2009/01/28 13:05:33 voyageur Exp $ + +*gnustep-base-1.18.0-r1 (28 Jan 2009) + + 28 Jan 2009; Bernard Cafarelli + -gnustep-base-1.18.0.ebuild, +gnustep-base-1.18.0-r1.ebuild: + Check that native exceptions are disabled in gnustep-make when using + ffcall, they only work with libffi 22 Dec 2008; Bernard Cafarelli -files/gnustep-base-1.18.0-unexpected_check.patch, diff --git a/gnustep-base/gnustep-base/gnustep-base-1.18.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r1.ebuild new file mode 100644 index 000000000000..e7e9827f3cae --- /dev/null +++ b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.18.0-r1.ebuild,v 1.1 2009/01/28 13:05:33 voyageur Exp $ + +EAPI=2 + +inherit gnustep-base + +DESCRIPTION="A library of general-purpose, non-graphical Objective C objects." + +HOMEPAGE="http://www.gnustep.org" +SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +SLOT="0" +LICENSE="GPL-2 LGPL-2.1" + +IUSE="gcc-libffi gnutls" + +DEPEND="${GNUSTEP_CORE_DEPEND} + >=gnustep-base/gnustep-make-2.0 + !gcc-libffi? ( dev-libs/ffcall + gnustep-base/gnustep-make[-native-exceptions] ) + gcc-libffi? ( >=sys-devel/gcc-3.3.5[libffi] ) + gnutls? ( net-libs/gnutls ) + >=dev-libs/libxml2-2.6 + >=dev-libs/libxslt-1.1 + >=dev-libs/gmp-4.1 + >=dev-libs/openssl-0.9.7 + >=sys-libs/zlib-1.2" +RDEPEND="${DEPEND}" + +src_configure() { + egnustep_env + + local myconf + if use gcc-libffi; + then + myconf="--enable-libffi --disable-ffcall" + else + myconf="--disable-libffi --enable-ffcall" + fi + + myconf="$myconf $(use_enable gnutls tls)" + myconf="$myconf --with-xml-prefix=/usr" + myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib" + myconf="$myconf --with-default-config=/etc/GNUstep/GNUstep.conf" + + econf $myconf || die "configure failed" +} + +src_install() { + # We need to set LD_LIBRARY_PATH because the doc generation program + # uses the gnustep-base libraries. Since egnustep_env "cleans the + # environment" including our LD_LIBRARY_PATH, we're left no choice + # but doing it like this. + + egnustep_env + egnustep_install + + if use doc ; then + export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}" + egnustep_doc + fi + egnustep_install_config + + dodir /etc/revdep-rebuild + sed -e 's|$GNUSTEP_SEARCH_DIRS|'"$GNUSTEP_SYSTEM_ROOT $GNUSTEP_LOCAL_ROOT"'|' \ + "${FILESDIR}"/50-gnustep-revdep \ + > "${D}/etc/revdep-rebuild/50-gnustep-revdep" +} + +pkg_postinst() { + ewarn "The shared library version has changed in this release." + ewarn "You will need to recompile all Applications/Tools/etc in order" + ewarn "to use this library." + ewarn "Run:" + ewarn "revdep-rebuild --library \"libgnustep-base.so.1.1[0-6]\"" +} diff --git a/gnustep-base/gnustep-base/gnustep-base-1.18.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.18.0.ebuild deleted file mode 100644 index 9d89a6cd79bd..000000000000 --- a/gnustep-base/gnustep-base/gnustep-base-1.18.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.18.0.ebuild,v 1.2 2008/12/22 16:14:18 voyageur Exp $ - -EAPI=2 - -inherit gnustep-base - -DESCRIPTION="A library of general-purpose, non-graphical Objective C objects." - -HOMEPAGE="http://www.gnustep.org" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -SLOT="0" -LICENSE="GPL-2 LGPL-2.1" - -IUSE="gcc-libffi gnutls" - -DEPEND="${GNUSTEP_CORE_DEPEND} - >=gnustep-base/gnustep-make-2.0 - !gcc-libffi? ( dev-libs/ffcall ) - gcc-libffi? ( >=sys-devel/gcc-3.3.5[libffi] ) - gnutls? ( net-libs/gnutls ) - >=dev-libs/libxml2-2.6 - >=dev-libs/libxslt-1.1 - >=dev-libs/gmp-4.1 - >=dev-libs/openssl-0.9.7 - >=sys-libs/zlib-1.2" -RDEPEND="${DEPEND}" - -src_configure() { - egnustep_env - - local myconf - if use gcc-libffi; - then - myconf="--enable-libffi --disable-ffcall" - else - myconf="--disable-libffi --enable-ffcall" - fi - - myconf="$myconf $(use_enable gnutls tls)" - myconf="$myconf --with-xml-prefix=/usr" - myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib" - myconf="$myconf --with-default-config=/etc/GNUstep/GNUstep.conf" - - econf $myconf || die "configure failed" -} - -src_install() { - # We need to set LD_LIBRARY_PATH because the doc generation program - # uses the gnustep-base libraries. Since egnustep_env "cleans the - # environment" including our LD_LIBRARY_PATH, we're left no choice - # but doing it like this. - - egnustep_env - egnustep_install - - if use doc ; then - export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}" - egnustep_doc - fi - egnustep_install_config - - dodir /etc/revdep-rebuild - sed -e 's|$GNUSTEP_SEARCH_DIRS|'"$GNUSTEP_SYSTEM_ROOT $GNUSTEP_LOCAL_ROOT"'|' \ - "${FILESDIR}"/50-gnustep-revdep \ - > "${D}/etc/revdep-rebuild/50-gnustep-revdep" -} - -pkg_postinst() { - ewarn "The shared library version has changed in this release." - ewarn "You will need to recompile all Applications/Tools/etc in order" - ewarn "to use this library." - ewarn "Run:" - ewarn "revdep-rebuild --library \"libgnustep-base.so.1.1[0-6]\"" -} -- cgit v1.2.3-65-gdbad