summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/polarssl/ChangeLog8
-rw-r--r--net-libs/polarssl/Manifest5
-rw-r--r--net-libs/polarssl/files/polarssl-0.12.0-makefile.patch13
-rw-r--r--net-libs/polarssl/polarssl-0.12.0.ebuild9
4 files changed, 28 insertions, 7 deletions
diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index a0450f762842..dfee96051c7f 100644
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/polarssl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.2 2009/09/23 18:50:54 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.3 2010/01/23 09:21:25 cla Exp $
+
+ 23 Jan 2010; Dawid Węgliński <cla@gentoo.org> polarssl-0.12.0.ebuild,
+ +files/polarssl-0.12.0-makefile.patch:
+ Respect user CFLAGS (bug #241036), fix install phase if USE="examples"
23 Sep 2009; Patrick Lauer <patrick@gentoo.org> polarssl-0.12.0.ebuild:
Remove virtual/libc
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index 843f6664b0a5..67360704c201 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -1,4 +1,5 @@
+AUX polarssl-0.12.0-makefile.patch 551 RMD160 fd3a2d5da8a56cf4130172fbe9f484553659a6e7 SHA1 244c39f6f4ec18cb57c36a04501f9bc3c6beb879 SHA256 527d173df3e3723228b8dc1c85bffb95ae040deedf28943f36d9fbd2d2decc63
DIST polarssl-0.12.0-gpl.tgz 336761 RMD160 8b5335589ef76e81b2b3dfecda96e5f4bc1f3b48 SHA1 980c245310fbd6b2f1e0bb5f9eab20f6515c723b SHA256 71e69a9071a73f501fbc08743b7b0e2fb84cfae1f2ca5c368dc0c4e33cfafb08
-EBUILD polarssl-0.12.0.ebuild 1404 RMD160 c2a81095afe18ada5c3776eaff3cf1b5ef1e8fb5 SHA1 30a2501b58277b28fc90edbb66332bad478117bf SHA256 6a62252edf660bc95c0f8f0986ab5e16f9b188de4d9e28a465ff55dfa308d92c
-MISC ChangeLog 482 RMD160 8d7b1ef179c9dbd29cea716f7142b319ba58d9db SHA1 e52626df2d1771f53541b42a234ef440e367203b SHA256 e2dbf08585d727e11deffdd73f1e000ae4ddfac710ac875945e353a911faa813
+EBUILD polarssl-0.12.0.ebuild 1475 RMD160 9783f77235073dc48273f2911424a6d66d68e853 SHA1 60cd24cb843d797d19e1519b4d87727c46589de5 SHA256 df38c684448eb90583ab0627ae68cfaaa133eef926c78da98bd6de44652c77fc
+MISC ChangeLog 667 RMD160 b342bbd26adb12167f619c0b28dc4c517bfc0640 SHA1 5f5287567259576f359ae91ee086937ed6462275 SHA256 9e7eeb7fbe607a63418cd14679f0ab38f5b63f2ee036eb678de61e46b3e01809
MISC metadata.xml 415 RMD160 95817166af90e00d701ca230525371cac893dc22 SHA1 3533728b17ddee286a3803d48208e13e926f6d69 SHA256 51ad0d646fd8a28ce72eded7e1eb3d3dead3a8460e219ccbb8bbe214bd49f3b5
diff --git a/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch b/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch
new file mode 100644
index 000000000000..807a27d3535e
--- /dev/null
+++ b/net-libs/polarssl/files/polarssl-0.12.0-makefile.patch
@@ -0,0 +1,13 @@
+diff -Naur polarssl-0.12.0.old/library/Makefile polarssl-0.12.0/library/Makefile
+--- polarssl-0.12.0.old/library/Makefile 2009-03-28 18:53:03.000000000 +0100
++++ polarssl-0.12.0/library/Makefile 2010-01-23 10:12:03.000000000 +0100
+@@ -1,8 +1,7 @@
+
+ # Also see "include/polarssl/config.h"
+
+-CFLAGS = -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement
+-OFLAGS = -O
++CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement
+
+ # MicroBlaze specific options:
+ # CFLAGS += -mno-xl-soft-mul -mxl-barrel-shift
diff --git a/net-libs/polarssl/polarssl-0.12.0.ebuild b/net-libs/polarssl/polarssl-0.12.0.ebuild
index 57e0831b717e..351196012fa1 100644
--- a/net-libs/polarssl/polarssl-0.12.0.ebuild
+++ b/net-libs/polarssl/polarssl-0.12.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-0.12.0.ebuild,v 1.2 2009/09/23 18:50:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-0.12.0.ebuild,v 1.3 2010/01/23 09:21:25 cla Exp $
+
+inherit eutils
DESCRIPTION="Cryptographic library for embedded systems"
HOMEPAGE="http://polarssl.org/"
@@ -21,6 +23,7 @@ src_compile() {
else
sed -i '15iCFLAGS += -fPIC' Makefile
fi
+ epatch "${FILESDIR}"/${P}-makefile.patch
emake libpolarssl.a || die "emake failed"
emake libpolarssl.so || die "emake failed"
@@ -44,7 +47,7 @@ src_install() {
if use examples ; then
for p in programs/*/* ; do
- if [ -x "${p}" ] ; then
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
f=polarssl_`basename "${p}"`
newbin "${p}" "${f}" || die
fi