slyfox 14/08/01 09:12:49 Modified: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog Log: fix installation on PaX kernels (thanks to yangjay) (Portage version: 2.2.10_p40/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path 1.13 dev-lang/ghc/ghc-7.6.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.12&r2=1.13 Index: ghc-7.6.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ghc-7.6.3-r1.ebuild 5 Jul 2014 15:40:40 -0000 1.12 +++ ghc-7.6.3-r1.ebuild 1 Aug 2014 09:12:49 -0000 1.13 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.12 2014/07/05 15:40:40 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.13 2014/08/01 09:12:49 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -604,10 +604,10 @@ # but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED' # 4 parallel jobs usually does not break - # 1. build compiler binary(+wrapper) first - emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1 + # 1. build compiler binary first + emake $(limit_jobs 4) ghc/stage2/build/tmp/ghc-stage2 V=1 # 2. pax-mark (bug #516430) - pax-mark -m inplace/lib/ghc-stage2 + pax-mark -m ghc/stage2/build/tmp/ghc-stage2 # 3. and then all the rest emake $(limit_jobs 4) all V=1 @@ -726,16 +726,11 @@ DESTDIR="${D}" \ || die "make ${insttarget} failed" - # remove wrapper and linker + # remove wrapper and link rm -f "${ED}"/usr/bin/haddock* add-c_nonshared-to-ghci-libs - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - # so mark resulting binary - pax-mark -m "${ED}/usr/$(get_libdir)/${P}/ghc" - if [[ ! -f "${S}/VERSION" ]]; then echo "${GHC_PV}" > "${S}/VERSION" \ || die "Could not create file ${S}/VERSION" 1.5 dev-lang/ghc/ghc-7.8.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.4&r2=1.5 Index: ghc-7.8.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ghc-7.8.3.ebuild 30 Jul 2014 13:20:16 -0000 1.4 +++ ghc-7.8.3.ebuild 1 Aug 2014 09:12:49 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.4 2014/07/30 13:20:16 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.5 2014/08/01 09:12:49 slyfox Exp $ EAPI=5 @@ -489,10 +489,10 @@ src_compile() { if ! use binary; then - # 1. build compiler binary(+wrapper) first - emake inplace/bin/ghc-stage2 + # 1. build compiler binary first + emake ghc/stage2/build/tmp/ghc-stage2 # 2. pax-mark (bug #516430) - pax-mark -m inplace/lib/bin/ghc-stage2 + pax-mark -m ghc/stage2/build/tmp/ghc-stage2 # 3. and then all the rest emake all fi # ! use binary @@ -525,11 +525,6 @@ # remove link, but leave 'haddock-${GHC_P}' rm -f "${ED}"/usr/bin/haddock - # ghci uses mmap with rwx protection at it implements dynamic - # linking on it's own (bug #299709) - # so mark resulting binary - pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/bin/ghc" - if [[ ! -f "${S}/VERSION" ]]; then echo "${GHC_PV}" > "${S}/VERSION" \ || die "Could not create file ${S}/VERSION" 1.262 dev-lang/ghc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.262&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.262&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.261&r2=1.262 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- ChangeLog 30 Jul 2014 13:20:16 -0000 1.261 +++ ChangeLog 1 Aug 2014 09:12:49 -0000 1.262 @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.261 2014/07/30 13:20:16 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.262 2014/08/01 09:12:49 slyfox Exp $ + + 01 Aug 2014; Sergei Trofimovich <[email protected]> ghc-7.6.3-r1.ebuild, + ghc-7.8.3.ebuild: + fix installation on PaX kernels (thanks to yangjay) 30 Jul 2014; Sergei Trofimovich <[email protected]> ghc-7.8.3.ebuild: Fix pax-marking command for final ghc binary.
