summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Pranaitis <jens@chaox.net>2010-05-09 16:34:47 +0200
committerJens Pranaitis <jens@chaox.net>2010-05-09 16:34:47 +0200
commit07ba5ab448d8bc56db2370e93682fc43c86cd876 (patch)
treeb86911a830424dcb2e0148ac7958c75a23ef4810 /app-crypt
parentmiracl: QA fixes (diff)
downloadjensp-07ba5ab448d8bc56db2370e93682fc43c86cd876.tar.gz
jensp-07ba5ab448d8bc56db2370e93682fc43c86cd876.tar.bz2
jensp-07ba5ab448d8bc56db2370e93682fc43c86cd876.zip
miracl: A lot of random fixes, thanks xmw
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/miracl/Manifest4
-rw-r--r--app-crypt/miracl/miracl-5.4.1.ebuild46
2 files changed, 20 insertions, 30 deletions
diff --git a/app-crypt/miracl/Manifest b/app-crypt/miracl/Manifest
index 697c756..46de352 100644
--- a/app-crypt/miracl/Manifest
+++ b/app-crypt/miracl/Manifest
@@ -1,3 +1,3 @@
AUX miracl-noexecstack.patch 6544 RMD160 b626fdcc71a2a8fcb2121740415d0755288c7dc7 SHA1 eb4074f98ca85dfcfa27f06c496d3a71186005f5 SHA256 3dadaa7730d77b229074d608c2f1e356f26d6b71769c9abbba3062764a99feb8
-DIST miracl-5.4.1.zip 1716771 RMD160 a8693a935f64089f72e8ac37ad10f7598e241c4b SHA1 07947a838ce216f05fd03e9ab2396e0debf3a3c1 SHA256 18aaaad5d7a85dfcef42f659db1a60d05c19a6c0eb66e0f6718124de8cfb5f50
-EBUILD miracl-5.4.1.ebuild 1198 RMD160 c4fd546711031e41b490be94b644dfd88737de9f SHA1 3cbffc197ff908e14b4b39331e9d34493e0450ea SHA256 eecbfd23657c6141b050bcd47f0f595baa331d5d51e93defdd7266b6e7dceccd
+DIST miracl-5.4.1.tar.bz2 1333376 RMD160 dc480fd8a878bde5dbef0419a78a0648170d94c4 SHA1 174078320814ac7e10e8a0638402dc6d56f5f765 SHA256 6fb91171459b5f6873bdf25bb7b146459522b75006736a802e8d3ef189625cb7
+EBUILD miracl-5.4.1.ebuild 966 RMD160 a3a451fa44c0d8394016bbd04d661f03730096db SHA1 972c23815dd4c8e3291502117373262e177cd26b SHA256 7334ac5f9cd96f1b176d8021e06730ecaa6226b0fc29656b25f0d94ffd69700b
diff --git a/app-crypt/miracl/miracl-5.4.1.ebuild b/app-crypt/miracl/miracl-5.4.1.ebuild
index 39c0f05..39989ca 100644
--- a/app-crypt/miracl/miracl-5.4.1.ebuild
+++ b/app-crypt/miracl/miracl-5.4.1.ebuild
@@ -2,49 +2,39 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=2
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="crypto library"
HOMEPAGE="http://www.shamus.ie"
-SRC_URI="http://chaox.net/~jens/${P}.zip"
+SRC_URI="http://chaox.net/~jens/${P}.tar.bz2"
LICENSE="free-noncomm"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"/
-
-src_unpack() {
- unzip -qo -j -aa -L "${DISTDIR}/${A}" || die "failure unpacking ${A}"
-}
-
src_prepare() {
- sed -i "s|gcc -c -m32 -O2|gcc -c -m32 $CFLAGS|g" linux
- sed -i "s|g++ -c -m32 -O2|g++ -c -m32 $CFLAGS|g" linux
- sed -i "s|gcc -c -m64 -O2|gcc -c -m64 -fPIC $CFLAGS|g" linux64
- sed -i "s|g++ -c -m64 -O2|g++ -c -m64 -fPIC $CFLAGS|g" linux64
- sed -i "s|mrmuldv.s|mrmuldv.S|g" linux
- sed -i "s|mrmuldv.s64|mrmuldv.S64|g" linux64
- epatch "${FILESDIR}"/$PN-noexecstack.patch || die 'patch failed'
-}
-
-src_compile() {
if use amd64; then
- bash ./linux64 || die "compile failed"
+ sed -i "s|gcc -c -m64 -O2|$(tc-getCC) -c -m64 -fPIC $CFLAGS|g" linux64 || die
+ sed -i "s|g++ -c -m64 -O2|$(tc-getCXX) -c -m64 -fPIC $CFLAGS|g" linux64 || die
+ mv linux64 linux || die
else
- bash ./linux || die "compile failed"
+ sed -i "s|gcc -c -m32 -O2|$(tc-getCC) -c -m32 $CFLAGS|g" linux || die
+ sed -i "s|g++ -c -m32 -O2|$(tc-getCXX) -c -m32 $CFLAGS|g" linux || die
fi
+ sed -i "s|mrmuldv.s|mrmuldv.S|g" linux || die
+ epatch "${FILESDIR}"/$PN-noexecstack.patch
+}
+
+src_compile() {
+ bash ./linux || die
}
src_install() {
- dolib.a miracl.a || die "installing lib failed"
- insinto /usr/include/miracl
- doins miracl.h mirdef.h || die "installing headers failed"
- dodoc *.txt || die "installing docs failed"
+ dolib.a ${PN}.a || die
+ insinto /usr/include/${PN}
+ doins ${PN}.h mirdef.h || die
+ dodoc *.txt || die
}