* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog
@ 2014-08-01 9:12 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-08-01 9:12 UTC (permalink / raw
To: gentoo-commits
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 <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild,
+ ghc-7.8.3.ebuild:
+ fix installation on PaX kernels (thanks to yangjay)
30 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.8.3.ebuild:
Fix pax-marking command for final ghc binary.
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog
@ 2014-08-01 20:33 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2014-08-01 20:33 UTC (permalink / raw
To: gentoo-commits
slyfox 14/08/01 20:33:54
Modified: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog
Log:
Fix hardened installation in PAX_MARKINGS=XT mode (bug #518734).
(Portage version: 2.2.10_p40/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.14 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.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.13&r2=1.14
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ghc-7.6.3-r1.ebuild 1 Aug 2014 09:12:49 -0000 1.13
+++ ghc-7.6.3-r1.ebuild 1 Aug 2014 20:33:54 -0000 1.14
@@ -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.13 2014/08/01 09:12:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.14 2014/08/01 20:33:54 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -443,6 +443,8 @@
epatch "${FILESDIR}"/${PN}-7.6.2-integer-simple-div-mod.patch
# ghc-7.8 changed linker code and likely fixed it
epatch "${FILESDIR}"/${PN}-7.6.3-trac-3333-weak-syms.patch
+ # bug 518734
+ epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
1.6 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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.5&r2=1.6
Index: ghc-7.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ghc-7.8.3.ebuild 1 Aug 2014 09:12:49 -0000 1.5
+++ ghc-7.8.3.ebuild 1 Aug 2014 20:33:54 -0000 1.6
@@ -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.5 2014/08/01 09:12:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.6 2014/08/01 20:33:54 slyfox Exp $
EAPI=5
@@ -400,6 +400,8 @@
epatch "${FILESDIR}"/${PN}-7.8.2-ia64-no-shared.patch
epatch "${FILESDIR}"/${PN}-7.8.2-cgen-constify.patch
epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+ # bug 518734
+ epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
if use prefix; then
# Make configure find docbook-xsl-stylesheets from Prefix
1.263 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.263&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.263&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.262&r2=1.263
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- ChangeLog 1 Aug 2014 09:12:49 -0000 1.262
+++ ChangeLog 1 Aug 2014 20:33:54 -0000 1.263
@@ -1,6 +1,11 @@
# 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.262 2014/08/01 09:12:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.263 2014/08/01 20:33:54 slyfox Exp $
+
+ 01 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/ghc-7.6.3-preserve-inplace-xattr.patch, ghc-7.6.3-r1.ebuild,
+ ghc-7.8.3.ebuild:
+ Fix hardened installation in PAX_MARKINGS=XT mode (bug #518734).
01 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ghc-7.6.3-r1.ebuild,
ghc-7.8.3.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-01 20:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-01 9:12 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2014-08-01 20:33 Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox