summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Smith <smithdanea@gmail.com>2010-07-28 20:54:08 -0400
committerDane Smith <smithdanea@gmail.com>2010-07-28 20:54:08 -0400
commit17df26a26c96297e408be518a447478cf4b54861 (patch)
tree6c1a2165b010a6c1a1186e0b45750354f3a5012d /dev-libs/cryptlib
parentRevert "New version to make my life easier" (diff)
parentUpdated cryptlib ebuild. Should honor use flags (diff)
downloadsmithdanea-17df26a26c96297e408be518a447478cf4b54861.tar.gz
smithdanea-17df26a26c96297e408be518a447478cf4b54861.tar.bz2
smithdanea-17df26a26c96297e408be518a447478cf4b54861.zip
Merge branch 'master' of ssh://172.18.0.100/home/code/git/smitdane/overlay
Diffstat (limited to 'dev-libs/cryptlib')
-rw-r--r--dev-libs/cryptlib/Manifest3
-rw-r--r--dev-libs/cryptlib/cryptlib-3.3.3.ebuild18
2 files changed, 18 insertions, 3 deletions
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 2ee736f..dd9c817 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -2,6 +2,7 @@ AUX cryptlib-3.3.2-external-zlib.patch 1086 RMD160 9f9da93a99945d66302d3bb458029
AUX cryptlib-3.3.2-ld.patch 821 RMD160 391e5a689f906a858c20be3721ccc3c3c81faa15 SHA1 2fe7573d1cd3f9f2f7d6ec18568420ac01d288a7 SHA256 0e813cd10d11f0dcfb8420d5e8690bf682faeb50e83c221a7e5bd35d44eaab4f
DIST cl333.zip 4530664 RMD160 4c84557c088b114cdc81e36ed3cc29960b822698 SHA1 128d24c98f1406cb4ba547617a73ec1e254caf33 SHA256 93e790963a93dd97843bce73908768bcf391103ebf4d71c893d4d35a220d327e
DIST cryptlib-3.3.3-manual.pdf.bz2 1066618 RMD160 27f18912b4f0194b76ca3a9a53839ec028c2473b SHA1 a87611f8aa69117b9bc511bb6c865ab8d723a94b SHA256 a52b0a7ef4c7288442f3189e1050492fa9c6c5048a09ce5f161a2a402dd068da
-EBUILD cryptlib-3.3.3.ebuild 3091 RMD160 b0e384f92ae4c3b3ccf1035b44b2c91f323cfcc7 SHA1 822871efeb0ac4dd58bdb09d7e8793c0778ea5da SHA256 2bc1937097552b101426ff86c6a70bd8e986564c085930b9b522b8802ac647ee
+EBUILD cryptlib-3.3.3.ebuild 3472 RMD160 34e581cdb5fe2248f318265a6a8bdb8d77a244ac SHA1 d3bad9a2d52caad0eb4d57802ac4a4fff913ba8f SHA256 038d337195e46714cf19b69802434cc6cba0f27bf6cad71b7e1a0740826b3f6b
MISC ChangeLog 4415 RMD160 e8ab586a6754851dd1301fb545648f243663688d SHA1 aee7adbdcd4a32130f71f4f94544eeb689d80e22 SHA256 fbf9f5c748d8fe7269c9e5af58ba409ee35fd733a9dfdcf2a560511d7e093be0
+MISC cryptlib-3.3.3.ebuild~ 3093 RMD160 78d184271982a4f2113e490941bfe9d5ed30cc07 SHA1 cd5e6d15a4d611616129686dd73e4b311825f3f7 SHA256 7f6c630fbb2372a9b7bc712503af74bbacfb1c885b230677c47da6a43a9aecb4
MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
diff --git a/dev-libs/cryptlib/cryptlib-3.3.3.ebuild b/dev-libs/cryptlib/cryptlib-3.3.3.ebuild
index 0691d84..ec0683a 100644
--- a/dev-libs/cryptlib/cryptlib-3.3.3.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.3.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
LICENSE="DB"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE="doc ldap odbc python"
@@ -67,14 +67,28 @@ src_prepare() {
src_compile() {
local libname="libcl.so.${PV}"
+
# At least -O2 is needed.
replace-flags -O -O2
replace-flags -O0 -O2
replace-flags -O1 -O2
replace-flags -Os -O2
is-flagq -O* || append-flags -O2
- append-flags "-D __UNIX__ -DOSVERSION=2 -DNDEBUG -I."
+ append-flags "-D __UNIX__ -DOSVERSION=2 -DNDEBUG -I."
+
+ if [ -f /usr/include/pthread.h -a \
+ `grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
+ append-flags "-DHAS_RECURSIVE_MUTEX"
+ fi
+ if [ -f /usr/include/pthread.h -a \
+ `grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
+ append-flags "-DHAS_ROBUST_MUTEX"
+ fi
+
+ use ldap && append-flags -DHAS_LDAP
+ use odbc && append-flags -DHAS_ODBC
+
emake directories || die
emake toolscripts || die
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux || die "emake static failed"