| 1 |
commit: 69c46b51bc046b7d2213a06f145ac11c074562fa |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 08:52:34 2016 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 08:54:38 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c46b51 |
| 7 |
|
| 8 |
dev-libs/libp11: ebuild cleanups |
| 9 |
|
| 10 |
fix parallel build issue and manage bindist USE |
| 11 |
|
| 12 |
Bug: 598408 |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0 |
| 15 |
|
| 16 |
dev-libs/libp11/files/libp11-0.4.2-build.patch | 29 ++++++++++++++++++++++++++ |
| 17 |
dev-libs/libp11/libp11-0.4.2.ebuild | 15 ++++++++++--- |
| 18 |
2 files changed, 41 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/libp11/files/libp11-0.4.2-build.patch b/dev-libs/libp11/files/libp11-0.4.2-build.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..ebbb38e |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-libs/libp11/files/libp11-0.4.2-build.patch |
| 25 |
@@ -0,0 +1,29 @@ |
| 26 |
+From 74b7c656b0a5325c8198ee137bac05878c99d585 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 28 |
+Date: Sat, 29 Oct 2016 11:39:29 +0300 |
| 29 |
+Subject: [PATCH] build: fix symlink installation |
| 30 |
+ |
| 31 |
+this fixes incorrect fix b313f00cc of symlink installation |
| 32 |
+by adding dependency instead of overwriting automake behavior. |
| 33 |
+ |
| 34 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 35 |
+--- |
| 36 |
+ src/Makefile.am | 5 ++--- |
| 37 |
+ 1 file changed, 2 insertions(+), 3 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
| 40 |
+index 2aa5195..d0dd37e 100644 |
| 41 |
+--- a/src/Makefile.am |
| 42 |
++++ b/src/Makefile.am |
| 43 |
+@@ -48,7 +48,7 @@ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \ |
| 44 |
+ check-local: $(LTLIBRARIES) |
| 45 |
+ cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT) |
| 46 |
+-install-exec-hook: |
| 47 |
++install-exec-hook: install-enginesLTLIBRARIES |
| 48 |
+ cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT) |
| 49 |
+ |
| 50 |
+ if WIN32 |
| 51 |
+ # def file required for MS users to build library |
| 52 |
+-- |
| 53 |
+2.7.3 |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/dev-libs/libp11/libp11-0.4.2.ebuild b/dev-libs/libp11/libp11-0.4.2.ebuild |
| 57 |
index 8a4218a..2451b3e 100644 |
| 58 |
--- a/dev-libs/libp11/libp11-0.4.2.ebuild |
| 59 |
+++ b/dev-libs/libp11/libp11-0.4.2.ebuild |
| 60 |
@@ -4,7 +4,7 @@ |
| 61 |
|
| 62 |
EAPI="6" |
| 63 |
|
| 64 |
-inherit eutils |
| 65 |
+inherit autotools eutils |
| 66 |
|
| 67 |
DESCRIPTION="Abstraction layer to simplify PKCS#11 API" |
| 68 |
HOMEPAGE="https://github.com/opensc/libp11/wiki" |
| 69 |
@@ -13,15 +13,24 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" |
| 70 |
LICENSE="LGPL-2.1" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 73 |
-IUSE="libressl doc static-libs" |
| 74 |
+IUSE="libressl bindist doc static-libs" |
| 75 |
|
| 76 |
RDEPEND=" |
| 77 |
- !libressl? ( dev-libs/openssl:0= ) |
| 78 |
+ !libressl? ( dev-libs/openssl:0=[bindist] ) |
| 79 |
libressl? ( dev-libs/libressl:0= )" |
| 80 |
DEPEND="${RDEPEND} |
| 81 |
virtual/pkgconfig |
| 82 |
doc? ( app-doc/doxygen )" |
| 83 |
|
| 84 |
+PATCHES=( |
| 85 |
+ "${FILESDIR}/${P}-build.patch" |
| 86 |
+) |
| 87 |
+ |
| 88 |
+src_prepare() { |
| 89 |
+ default |
| 90 |
+ eautoreconf |
| 91 |
+} |
| 92 |
+ |
| 93 |
src_configure() { |
| 94 |
econf \ |
| 95 |
--enable-shared \ |
Archives