summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-06-20 13:38:52 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-06-20 13:38:52 +0000
commitdbf104203b2461825cf8a864b1cef207a9f64075 (patch)
tree40b537ebf90bb18210a134caa014e36853df85a5 /dev-libs/angelscript
parentUse AC_CONFIG_HEADERS instead of the deprecated AM_CONFIG_HEADER wrt #472522 ... (diff)
downloadgentoo-2-dbf104203b2461825cf8a864b1cef207a9f64075.tar.gz
gentoo-2-dbf104203b2461825cf8a864b1cef207a9f64075.tar.bz2
gentoo-2-dbf104203b2461825cf8a864b1cef207a9f64075.zip
fix build wrt #513902
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'dev-libs/angelscript')
-rw-r--r--dev-libs/angelscript/ChangeLog6
-rw-r--r--dev-libs/angelscript/angelscript-2.29.0.ebuild4
-rw-r--r--dev-libs/angelscript/files/angelscript-2.29.0-execstack.patch13
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-libs/angelscript/ChangeLog b/dev-libs/angelscript/ChangeLog
index 78925e97d076..1301ef4359cd 100644
--- a/dev-libs/angelscript/ChangeLog
+++ b/dev-libs/angelscript/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/angelscript
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.18 2014/06/11 18:43:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/ChangeLog,v 1.19 2014/06/20 13:38:52 hasufell Exp $
+
+ 20 Jun 2014; Julian Ospald <hasufell@gentoo.org> angelscript-2.29.0.ebuild,
+ +files/angelscript-2.29.0-execstack.patch:
+ fix build wrt #513902
*angelscript-2.29.0 (11 Jun 2014)
diff --git a/dev-libs/angelscript/angelscript-2.29.0.ebuild b/dev-libs/angelscript/angelscript-2.29.0.ebuild
index bdc652b1469a..0dec4a42b833 100644
--- a/dev-libs/angelscript/angelscript-2.29.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.29.0.ebuild
@@ -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-libs/angelscript/angelscript-2.29.0.ebuild,v 1.1 2014/06/11 18:43:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/angelscript/angelscript-2.29.0.ebuild,v 1.2 2014/06/20 13:38:52 hasufell Exp $
EAPI=5
@@ -28,7 +28,7 @@ src_prepare() {
if use static-libs ; then
cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
fi
- epatch "${FILESDIR}"/${PN}-2.28.2-execstack.patch
+ epatch "${FILESDIR}"/${P}-execstack.patch
multilib_copy_sources
}
diff --git a/dev-libs/angelscript/files/angelscript-2.29.0-execstack.patch b/dev-libs/angelscript/files/angelscript-2.29.0-execstack.patch
new file mode 100644
index 000000000000..2cdb6696dd70
--- /dev/null
+++ b/dev-libs/angelscript/files/angelscript-2.29.0-execstack.patch
@@ -0,0 +1,13 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Mar 23 13:45:39 UTC 2014
+Subject: fix RWX sections
+
+--- a/sdk/angelscript/source/as_callfunc_arm_gcc.S
++++ b/sdk/angelscript/source/as_callfunc_arm_gcc.S
+@@ -696,3 +696,6 @@
+
+ #endif /* arm */
+
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif