1 |
commit: 288701ce317e0530f533163121dd67fcd8396635 |
2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
3 |
AuthorDate: Fri Jun 26 10:19:48 2020 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Fri Jun 26 10:20:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=288701ce |
7 |
|
8 |
net-libs/usockets: removed unneeded BDEPEND |
9 |
|
10 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
11 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
12 |
|
13 |
net-libs/usockets/files/usockets-Makefile.patch | 17 +++++------------ |
14 |
net-libs/usockets/metadata.xml | 18 +++++++++++------- |
15 |
...sockets-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} | 20 +++++++++----------- |
16 |
net-libs/usockets/usockets-9999.ebuild | 20 +++++++++----------- |
17 |
4 files changed, 34 insertions(+), 41 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch |
20 |
index a51f8b1..5be09ee 100644 |
21 |
--- a/net-libs/usockets/files/usockets-Makefile.patch |
22 |
+++ b/net-libs/usockets/files/usockets-Makefile.patch |
23 |
@@ -1,5 +1,5 @@ |
24 |
diff --git a/Makefile b/Makefile |
25 |
-index fa6e2ff..529ed74 100644 |
26 |
+index fa6e2ff..ca2603f 100644 |
27 |
--- a/Makefile |
28 |
+++ b/Makefile |
29 |
@@ -1,3 +1,14 @@ |
30 |
@@ -17,28 +17,21 @@ index fa6e2ff..529ed74 100644 |
31 |
# WITH_OPENSSL=1 enables OpenSSL 1.1+ support |
32 |
ifeq ($(WITH_OPENSSL),1) |
33 |
override CFLAGS += -DLIBUS_USE_OPENSSL |
34 |
-@@ -33,13 +44,33 @@ ifeq ($(WITH_ASAN),1) |
35 |
+@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1) |
36 |
endif |
37 |
|
38 |
override CFLAGS += -std=c11 -Isrc |
39 |
-override LDFLAGS += uSockets.a |
40 |
|
41 |
-# By default we build the uSockets.a static library |
42 |
--default: |
43 |
-+static: |
44 |
+ default: |
45 |
rm -f *.o |
46 |
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c |
47 |
- $(AR) rvs uSockets.a *.o |
48 |
-+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c |
49 |
-+ $(AR) rvs libusockets.a *.o |
50 |
-+ |
51 |
-+dynamic: |
52 |
-+ rm -f *.o |
53 |
+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS) |
54 |
++ $(AR) rvs libusockets.a *.o |
55 |
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS) |
56 |
+ |
57 |
-+default: static dynamic |
58 |
-+ |
59 |
+install: |
60 |
+ # install the folders needed (making sure that the exist) |
61 |
+ install -d "$(DESTDIR)$(libdir)" \ |
62 |
@@ -56,7 +49,7 @@ index fa6e2ff..529ed74 100644 |
63 |
|
64 |
# Builds all examples |
65 |
.PHONY: examples |
66 |
-@@ -52,4 +83,5 @@ swift_examples: |
67 |
+@@ -52,4 +77,5 @@ swift_examples: |
68 |
clean: |
69 |
rm -f *.o |
70 |
rm -f *.a |
71 |
|
72 |
diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml |
73 |
index 73dd576..a24f33a 100644 |
74 |
--- a/net-libs/usockets/metadata.xml |
75 |
+++ b/net-libs/usockets/metadata.xml |
76 |
@@ -1,11 +1,15 @@ |
77 |
<?xml version="1.0" encoding="UTF-8"?> |
78 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
79 |
<pkgmetadata> |
80 |
- <maintainer type="person"> |
81 |
- <email>gentoo@×××××.cc</email> |
82 |
- <name>Aisha Tammy</name> |
83 |
- </maintainer> |
84 |
- <use> |
85 |
- <flag name="libuv">Enable bindings to use the libuv dispatcher</flag> |
86 |
- </use> |
87 |
+ <maintainer type="person"> |
88 |
+ <email>gentoo@×××××.cc</email> |
89 |
+ <name>Aisha Tammy</name> |
90 |
+ </maintainer> |
91 |
+ <maintainer type="project"> |
92 |
+ <email>proxy-maint@g.o</email> |
93 |
+ <name>Proxy Maintainers</name> |
94 |
+ </maintainer> |
95 |
+ <use> |
96 |
+ <flag name="libuv">Enable bindings to use the libuv dispatcher</flag> |
97 |
+ </use> |
98 |
</pkgmetadata> |
99 |
|
100 |
diff --git a/net-libs/usockets/usockets-0.4.1.ebuild b/net-libs/usockets/usockets-0.4.1-r1.ebuild |
101 |
similarity index 78% |
102 |
rename from net-libs/usockets/usockets-0.4.1.ebuild |
103 |
rename to net-libs/usockets/usockets-0.4.1-r1.ebuild |
104 |
index 0b4a1f0..07f6828 100644 |
105 |
--- a/net-libs/usockets/usockets-0.4.1.ebuild |
106 |
+++ b/net-libs/usockets/usockets-0.4.1-r1.ebuild |
107 |
@@ -27,7 +27,6 @@ DEPEND="ssl? ( |
108 |
) |
109 |
libuv? ( dev-libs/libuv[static-libs?] ) |
110 |
" |
111 |
-BDEPEND="${DEPEND}" |
112 |
RDEPEND="${DEPEND}" |
113 |
|
114 |
PATCHES=( |
115 |
@@ -36,19 +35,18 @@ PATCHES=( |
116 |
|
117 |
src_compile() { |
118 |
# the Makefile uses environment variables |
119 |
- emake -j1 \ |
120 |
- LIBusockets_VERSION=${PV} \ |
121 |
- WITH_OPENSSL=$(usex ssl 1 0) \ |
122 |
- WITH_LIBUV=$(usex libuv 1 0) \ |
123 |
- default |
124 |
+ emake LIBusockets_VERSION=${PV} \ |
125 |
+ WITH_OPENSSL=$(usex ssl 1 0) \ |
126 |
+ WITH_LIBUV=$(usex libuv 1 0) \ |
127 |
+ default |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
- emake -j1 \ |
132 |
- libdir="/usr/$(get_libdir)" \ |
133 |
- prefix="/usr" DESTDIR="${D}" \ |
134 |
- LIBusockets_VERSION=${PV} \ |
135 |
- install |
136 |
+ emake libdir="/usr/$(get_libdir)" \ |
137 |
+ prefix="/usr" \ |
138 |
+ DESTDIR="${D}" \ |
139 |
+ LIBusockets_VERSION=${PV} \ |
140 |
+ install |
141 |
einstalldocs |
142 |
if ! use static-libs; then |
143 |
rm "${D}/usr/$(get_libdir)/libusockets.a" || die |
144 |
|
145 |
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild |
146 |
index 0b4a1f0..07f6828 100644 |
147 |
--- a/net-libs/usockets/usockets-9999.ebuild |
148 |
+++ b/net-libs/usockets/usockets-9999.ebuild |
149 |
@@ -27,7 +27,6 @@ DEPEND="ssl? ( |
150 |
) |
151 |
libuv? ( dev-libs/libuv[static-libs?] ) |
152 |
" |
153 |
-BDEPEND="${DEPEND}" |
154 |
RDEPEND="${DEPEND}" |
155 |
|
156 |
PATCHES=( |
157 |
@@ -36,19 +35,18 @@ PATCHES=( |
158 |
|
159 |
src_compile() { |
160 |
# the Makefile uses environment variables |
161 |
- emake -j1 \ |
162 |
- LIBusockets_VERSION=${PV} \ |
163 |
- WITH_OPENSSL=$(usex ssl 1 0) \ |
164 |
- WITH_LIBUV=$(usex libuv 1 0) \ |
165 |
- default |
166 |
+ emake LIBusockets_VERSION=${PV} \ |
167 |
+ WITH_OPENSSL=$(usex ssl 1 0) \ |
168 |
+ WITH_LIBUV=$(usex libuv 1 0) \ |
169 |
+ default |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
- emake -j1 \ |
174 |
- libdir="/usr/$(get_libdir)" \ |
175 |
- prefix="/usr" DESTDIR="${D}" \ |
176 |
- LIBusockets_VERSION=${PV} \ |
177 |
- install |
178 |
+ emake libdir="/usr/$(get_libdir)" \ |
179 |
+ prefix="/usr" \ |
180 |
+ DESTDIR="${D}" \ |
181 |
+ LIBusockets_VERSION=${PV} \ |
182 |
+ install |
183 |
einstalldocs |
184 |
if ! use static-libs; then |
185 |
rm "${D}/usr/$(get_libdir)/libusockets.a" || die |