1 |
commit: 0e6d486dfde2656ece413843ea22db5ad73fd91b |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 31 19:47:03 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 31 19:47:33 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e6d486d |
7 |
|
8 |
dev-libs/cryptlib: fixups (beta) |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild | 25 +++---- |
13 |
.../cryptlib/files/cryptlib-3.4.4_beta-build.patch | 76 ++++++++++++++++++++-- |
14 |
2 files changed, 81 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild b/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild |
17 |
index 7bca33567f3..cc10e5c17e6 100644 |
18 |
--- a/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild |
19 |
+++ b/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild |
20 |
@@ -66,6 +66,13 @@ pkg_setup() { |
21 |
# Add our own CFLAGS/CPPFLAGS |
22 |
# |
23 |
export EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" |
24 |
+ |
25 |
+ # |
26 |
+ # Disable internal zlib dependnecies |
27 |
+ # For some reason this applied also when |
28 |
+ # System zlib is being used |
29 |
+ # |
30 |
+ COMMON_MAKE_OPTS="ZLIBOBJS= CC=$(tc-getCC) AR=$(tc-getAR) STRIP=true" |
31 |
} |
32 |
|
33 |
src_prepare() { |
34 |
@@ -98,12 +105,6 @@ src_compile() { |
35 |
use ldap && append-cppflags -DHAS_LDAP |
36 |
use odbc && append-cppflags -DHAS_ODBC |
37 |
|
38 |
- # |
39 |
- # Disable internal zlib dependnecies |
40 |
- # For some reason this applied also when |
41 |
- # System zlib is being used |
42 |
- # |
43 |
- COMMON_MAKE_OPTS="ZLIBOBJS= CC=$(tc-getCC) AR=$(tc-getAR) STRIP=true" |
44 |
emake ${COMMON_MAKE_OPTS} shared |
45 |
use static-libs && emake ${COMMON_MAKE_OPTS} default |
46 |
use test && emake ${COMMON_MAKE_OPTS} stestlib |
47 |
@@ -115,7 +116,8 @@ src_compile() { |
48 |
# 1. python will link against the static lib |
49 |
# 2. tests will not work find soname. |
50 |
# |
51 |
- # Bad upstream behavior |
52 |
+ # Upstream should have created the symlinks when |
53 |
+ # building and not when installing. |
54 |
# |
55 |
local libname="libcl.so.$(get_version_component_range 1-3 ${PV})" |
56 |
local solibname="libcl.so.$(get_version_component_range 1-2 ${PV})" |
57 |
@@ -132,16 +134,9 @@ src_test() { |
58 |
} |
59 |
|
60 |
src_install() { |
61 |
+ emake install ${COMMON_MAKE_OPTS} DESTDIR="${D}" PREFIX=/usr PATH_LIB="/usr/$(get_libdir)" |
62 |
einstalldocs |
63 |
|
64 |
- # |
65 |
- # Upstream does not provide |
66 |
- # a simple target for install |
67 |
- # |
68 |
- doheader cryptlib.h |
69 |
- dolib.so libcl.so* |
70 |
- use static-libs && dolib.a libcl.a |
71 |
- |
72 |
wrap_python ${FUNCNAME} |
73 |
|
74 |
if use doc; then |
75 |
|
76 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch b/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch |
77 |
index 1a99287c6f3..e2530b7e557 100644 |
78 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch |
79 |
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch |
80 |
@@ -1,7 +1,7 @@ |
81 |
-From 188dce32ea9c58271c8ce48ab02a3b255498bf9f Mon Sep 17 00:00:00 2001 |
82 |
+From 515d66d1d091b444330b225127b084a9b19fa807 Mon Sep 17 00:00:00 2001 |
83 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
84 |
-Date: Sat, 4 Feb 2017 05:08:47 +0200 |
85 |
-Subject: [PATCH] build: allow specify additional CFLAGS |
86 |
+Date: Thu, 31 Aug 2017 22:12:52 +0300 |
87 |
+Subject: [PATCH 1/3] build: allow specify additional CFLAGS |
88 |
|
89 |
Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
90 |
--- |
91 |
@@ -9,7 +9,7 @@ Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
92 |
1 file changed, 1 insertion(+), 1 deletion(-) |
93 |
|
94 |
diff --git a/makefile b/makefile |
95 |
-index cb9884c..827a78a 100644 |
96 |
+index de5381f..a31bc1d 100644 |
97 |
--- a/makefile |
98 |
+++ b/makefile |
99 |
@@ -90,7 +90,7 @@ DYLIBNAME = lib$(PROJ).$(MAJ).$(MIN).dylib |
100 |
@@ -22,4 +22,70 @@ index cb9884c..827a78a 100644 |
101 |
CFLAGS_COVERAGE = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1 --coverage -fprofile-arcs -ftest-coverage |
102 |
CFLAGS_DEBUG = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O0 |
103 |
-- |
104 |
-2.10.2 |
105 |
+2.13.5 |
106 |
+ |
107 |
+From cbec0a8ab9fab9acda239d3f37b7e593ac8e44e9 Mon Sep 17 00:00:00 2001 |
108 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
109 |
+Date: Thu, 31 Aug 2017 22:14:47 +0300 |
110 |
+Subject: [PATCH 2/3] build: install: create correct directories + quote |
111 |
+ |
112 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
113 |
+--- |
114 |
+ makefile | 12 ++++++------ |
115 |
+ 1 file changed, 6 insertions(+), 6 deletions(-) |
116 |
+ |
117 |
+diff --git a/makefile b/makefile |
118 |
+index a31bc1d..2a49040 100644 |
119 |
+--- a/makefile |
120 |
++++ b/makefile |
121 |
+@@ -443,13 +443,13 @@ PATH_LIB=$(PREFIX)/lib |
122 |
+ PATH_INCLUDE=$(PREFIX)/include |
123 |
+ |
124 |
+ install-dirs: |
125 |
+- @if [ ! -d $(PATH_LIB) ] ; then \ |
126 |
+- mkdir $(PATH_LIB) ; \ |
127 |
+- chmod 755 $(PATH_LIB) ; \ |
128 |
++ @if [ ! -d "$(DESTDIR)$(PATH_LIB)" ] ; then \ |
129 |
++ mkdir -p "$(DESTDIR)$(PATH_LIB)" ; \ |
130 |
++ chmod 755 "$(DESTDIR)$(PATH_LIB)" ; \ |
131 |
+ fi |
132 |
+- @if [ ! -d $(PATH_INCLUDE) ] ; then \ |
133 |
+- mkdir $(PATH_INCLUDE) ; \ |
134 |
+- chmod 755 $(PATH_INCLUDE) ; \ |
135 |
++ @if [ ! -d "$(DESTDIR)$(PATH_INCLUDE)" ] ; then \ |
136 |
++ mkdir -p "$(DESTDIR)$(PATH_INCLUDE)" ; \ |
137 |
++ chmod 755 "$(DESTDIR)$(PATH_INCLUDE)" ; \ |
138 |
+ fi |
139 |
+ |
140 |
+ install: |
141 |
+-- |
142 |
+2.13.5 |
143 |
+ |
144 |
+From 78cd16457a88e0d79a5b61d8dee29b535cd81a28 Mon Sep 17 00:00:00 2001 |
145 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
146 |
+Date: Thu, 31 Aug 2017 22:30:25 +0300 |
147 |
+Subject: [PATCH 3/3] build: install: use relative symlinks |
148 |
+ |
149 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
150 |
+--- |
151 |
+ makefile | 4 ++-- |
152 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
153 |
+ |
154 |
+diff --git a/makefile b/makefile |
155 |
+index 2a49040..5582252 100644 |
156 |
+--- a/makefile |
157 |
++++ b/makefile |
158 |
+@@ -461,8 +461,8 @@ install: |
159 |
+ if [ -f "$(SLIBNAME)" ] ; then \ |
160 |
+ cp "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)" ; \ |
161 |
+ chmod 755 "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" ; \ |
162 |
+- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \ |
163 |
+- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \ |
164 |
++ ln -s "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \ |
165 |
++ ln -s "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \ |
166 |
+ fi |
167 |
+ cp cryptlib.h "$(DESTDIR)$(PATH_INCLUDE)" |
168 |
+ chmod 644 "$(DESTDIR)$(PATH_INCLUDE)/cryptlib.h" |
169 |
+-- |
170 |
+2.13.5 |
171 |
+ |