diff options
author | Fabian Groffen <grobian@gentoo.org> | 2012-03-01 19:26:35 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2012-03-01 19:26:35 +0000 |
commit | bd4eb9a3574add9fe853660d499b39cc20642a51 (patch) | |
tree | 812e9785bcf236e070db4ef9b2f4f1d6f622672d /dev-lang | |
parent | [bump] virtual/perl-Digest-SHA-5.710.0 (diff) | |
download | gentoo-2-bd4eb9a3574add9fe853660d499b39cc20642a51.tar.gz gentoo-2-bd4eb9a3574add9fe853660d499b39cc20642a51.tar.bz2 gentoo-2-bd4eb9a3574add9fe853660d499b39cc20642a51.zip |
Backport Darwin fixes also to stable channel release
(Portage version: 2.2.01.20239-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/v8/ChangeLog | 5 | ||||
-rw-r--r-- | dev-lang/v8/v8-3.8.9.8.ebuild | 32 |
2 files changed, 30 insertions, 7 deletions
diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog index a741556e0b46..c76e43053d25 100644 --- a/dev-lang/v8/ChangeLog +++ b/dev-lang/v8/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/v8 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.141 2012/03/01 18:48:18 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.142 2012/03/01 19:26:35 grobian Exp $ + + 01 Mar 2012; Fabian Groffen <grobian@gentoo.org> v8-3.8.9.8.ebuild: + Backport Darwin fixes also to stable channel release 01 Mar 2012; Fabian Groffen <grobian@gentoo.org> v8-3.9.11.ebuild: Fix misc compilation and installation issues on Darwin diff --git a/dev-lang/v8/v8-3.8.9.8.ebuild b/dev-lang/v8/v8-3.8.9.8.ebuild index c6dc10918d13..0a609e0d1124 100644 --- a/dev-lang/v8/v8-3.8.9.8.ebuild +++ b/dev-lang/v8/v8-3.8.9.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.8.ebuild,v 1.1 2012/02/22 02:54:12 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.8.ebuild,v 1.2 2012/03/01 19:26:34 grobian Exp $ EAPI="4" @@ -31,6 +31,26 @@ pkg_setup() { python_pkg_setup } +src_prepare() { + # don't force 32-bits mode on Darwin + sed -i -e '/-arch i386/d' build/gyp/pylib/gyp/generator/make.py || die + # force using Makefiles, instead of Xcode project file on Darwin + sed -i -e '/darwin/s/xcode/make/' build/gyp/pylib/gyp/__init__.py || die + # don't refuse to build shared_libs because we build somewhere else + sed -i \ + -e '/params\.get.*mac.*darwin.*linux/s/mac/darwin/' \ + -e "/if GetFlavor(params) == 'mac':/s/mac/darwin/" \ + -e "/^ if flavor == 'mac':/s/mac/darwin/" \ + build/gyp/pylib/gyp/generator/make.py || die + # make sure our v8.dylib doesn't end up being empty and give it a proper + # install_name (soname) + sed -i \ + -e '/^LINK_COMMANDS_MAC =/,/^SHARED_HEADER =/s#-shared#-dynamiclib -all_load -install_name '"${EPREFIX}/usr/$(get_libdir)/libv8$(get_libname $(get_version_component_range 1-3))"'#' \ + build/gyp/pylib/gyp/generator/make.py || die + # don't force targetting old machines + sed -i -e "s/, '-mmacosx-version-min=10.4'//" SConstruct || die +} + src_compile() { tc-export AR CC CXX RANLIB export LINK="${CXX}" @@ -90,13 +110,13 @@ src_install() { dobin out/${mytarget}/d8 || die if [[ ${CHOST} == *-darwin* ]] ; then - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname).${soname_version} \ - out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die + # buildsystem is too horrific to get this built correctly + mv out/${mytarget}/lib.target/libv8.so.${soname_version} \ + out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die fi - dolib out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die - dosym libv8$(get_libname).${soname_version} /usr/$(get_libdir)/libv8$(get_libname) || die + dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die + dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die dodoc AUTHORS ChangeLog || die } |