ssuominen    14/05/30 11:08:56

  Modified:             ChangeLog
  Added:                libffi-3.1-r3.ebuild
  Log:
  Fix typing error in ffi.h.in (missing @@) wrt #511752 by Ryan Hill and 
Patrick Lauer
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
4868F14D)

Revision  Changes    Path
1.191                dev-libs/libffi/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libffi/ChangeLog?rev=1.191&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libffi/ChangeLog?rev=1.191&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libffi/ChangeLog?r1=1.190&r2=1.191

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog   29 May 2014 04:51:18 -0000      1.190
+++ ChangeLog   30 May 2014 11:08:56 -0000      1.191
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.190 
2014/05/29 04:51:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.191 
2014/05/30 11:08:56 ssuominen Exp $
+
+*libffi-3.1-r3 (30 May 2014)
+
+  30 May 2014; Samuli Suominen <ssuomi...@gentoo.org> +libffi-3.1-r3.ebuild,
+  +files/libffi-3.1-typing_error.patch:
+  Fix typing error in ffi.h.in (missing @@) wrt #511752 by Ryan Hill and
+  Patrick Lauer
 
   29 May 2014; Samuli Suominen <ssuomi...@gentoo.org> -libffi-3.1-r1.ebuild,
   -libffi-3.1.ebuild:



1.1                  dev-libs/libffi/libffi-3.1-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild?rev=1.1&content-type=text/plain

Index: libffi-3.1-r3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild,v 1.1 
2014/05/30 11:08:56 ssuominen Exp $

EAPI=5
inherit eutils libtool multilib multilib-minimal toolchain-funcs

DESCRIPTION="a portable, high level programming interface to various calling 
conventions."
HOMEPAGE="http://sourceware.org/libffi/";
SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz";

LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel static-libs test"

RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
DEPEND="test? ( dev-util/dejagnu )"

DOCS="ChangeLog* README"

ECONF_SOURCE=${S}

pkg_setup() {
        # Check for orphaned libffi, see http://bugs.gentoo.org/354903 for 
example
        if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version 
${CATEGORY}/${PN}; then
                local base="${T}"/conftest
                echo 'int main() { }' > "${base}".c
                $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
                if [ $? -eq 0 ]; then
                        eerror "The linker reported linking against -lffi to be 
working while it shouldn't have."
                        eerror "This is wrong and you should find and delete 
the old copy of libffi before continuing."
                        die "The system is in inconsistent state with unknown 
libffi installed."
                fi
        fi
}

src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-execstack.patch \
                "${FILESDIR}"/${P}-typing_error.patch

        sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
        # http://sourceware.org/ml/libffi-discuss/2014/msg00060.html
        sed -i -e 's:@toolexeclibdir@:${libdir}:' libffi.pc.in || die #511726

        epatch_user
        elibtoolize
}

multilib_src_configure() {
        use userland_BSD && export HOST="${CHOST}"
        econf \
                $(use_enable static-libs static) \
                $(use_enable pax_kernel pax_emutramp) \
                $(use_enable debug)
}

multilib_src_install_all() {
        prune_libtool_files
        einstalldocs
}




Reply via email to