1 |
commit: 312fbb322f44b3023a33e93f7c5a2eda32636a5c |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Sat Nov 28 23:08:57 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 28 23:08:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312fbb32 |
7 |
|
8 |
net-misc/usbip: fix build with gcc-10 |
9 |
|
10 |
* Unconditionally disable static-libs |
11 |
* Thanks to Jeroen Roovers for submitting the patch |
12 |
|
13 |
Closes: https://bugs.gentoo.org/707222 |
14 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
15 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
17 |
|
18 |
net-misc/usbip/files/usbip-4.13-fno-common.patch | 44 ++++++++++++++++++++++ |
19 |
.../{usbip-4.13.ebuild => usbip-4.13-r1.ebuild} | 22 +++++------ |
20 |
2 files changed, 55 insertions(+), 11 deletions(-) |
21 |
|
22 |
diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch b/net-misc/usbip/files/usbip-4.13-fno-common.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..b8ffc40c4b9 |
25 |
--- /dev/null |
26 |
+++ b/net-misc/usbip/files/usbip-4.13-fno-common.patch |
27 |
@@ -0,0 +1,44 @@ |
28 |
+--- a/libsrc/usbip_common.c |
29 |
++++ b/libsrc/usbip_common.c |
30 |
+@@ -14,7 +14,7 @@ |
31 |
+ int usbip_use_stderr; |
32 |
+ int usbip_use_debug; |
33 |
+ |
34 |
+-extern struct udev *udev_context; |
35 |
++struct udev *udev_context; |
36 |
+ |
37 |
+ struct speed_string { |
38 |
+ int num; |
39 |
+--- alibsrc/usbip_common.h |
40 |
++++ b/libsrc/usbip_common.h |
41 |
+@@ -53,6 +53,8 @@ |
42 |
+ #define ST_NODEV 0x04 |
43 |
+ #define ST_ERROR 0x05 |
44 |
+ |
45 |
++extern struct udev *udev_context; |
46 |
++ |
47 |
+ extern int usbip_use_syslog; |
48 |
+ extern int usbip_use_stderr; |
49 |
+ extern int usbip_use_debug ; |
50 |
+--- a/libsrc/usbip_host_common.c |
51 |
++++ b/libsrc/usbip_host_common.c |
52 |
+@@ -23,8 +23,6 @@ |
53 |
+ #include "list.h" |
54 |
+ #include "sysfs_utils.h" |
55 |
+ |
56 |
+-struct udev *udev_context; |
57 |
+- |
58 |
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) |
59 |
+ { |
60 |
+ char status_attr_path[SYSFS_PATH_MAX]; |
61 |
+--- a/libsrc/vhci_driver.c |
62 |
++++ b/libsrc/vhci_driver.c |
63 |
+@@ -15,7 +15,6 @@ |
64 |
+ #define PROGNAME "libusbip" |
65 |
+ |
66 |
+ struct usbip_vhci_driver *vhci_driver; |
67 |
+-struct udev *udev_context; |
68 |
+ |
69 |
+ static struct usbip_imported_device * |
70 |
+ imported_device_init(struct usbip_imported_device *idev, char *busid) |
71 |
+ |
72 |
|
73 |
diff --git a/net-misc/usbip/usbip-4.13.ebuild b/net-misc/usbip/usbip-4.13-r1.ebuild |
74 |
similarity index 77% |
75 |
rename from net-misc/usbip/usbip-4.13.ebuild |
76 |
rename to net-misc/usbip/usbip-4.13-r1.ebuild |
77 |
index bfb8473198b..453bd87fa8f 100644 |
78 |
--- a/net-misc/usbip/usbip-4.13.ebuild |
79 |
+++ b/net-misc/usbip/usbip-4.13-r1.ebuild |
80 |
@@ -2,9 +2,10 @@ |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
|
83 |
EAPI=6 |
84 |
+ |
85 |
ETYPE="sources" |
86 |
K_NOUSENAME=1 |
87 |
-inherit autotools eutils kernel-2 ltprune |
88 |
+inherit autotools kernel-2 |
89 |
|
90 |
DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks" |
91 |
HOMEPAGE="https://www.kernel.org/" |
92 |
@@ -13,10 +14,10 @@ SRC_URI="${KERNEL_URI}" |
93 |
LICENSE="GPL-2" |
94 |
SLOT="0" |
95 |
KEYWORDS="~amd64 ~x86" |
96 |
-IUSE="static-libs tcpd" |
97 |
-RESTRICT="" |
98 |
+IUSE="tcpd" |
99 |
|
100 |
-RDEPEND=">=dev-libs/glib-2.6 |
101 |
+RDEPEND=" |
102 |
+ >=dev-libs/glib-2.6 |
103 |
sys-apps/hwids |
104 |
>=sys-kernel/linux-headers-3.17 |
105 |
virtual/libudev |
106 |
@@ -24,33 +25,32 @@ RDEPEND=">=dev-libs/glib-2.6 |
107 |
DEPEND="${RDEPEND} |
108 |
virtual/pkgconfig" |
109 |
|
110 |
-DOCS="AUTHORS README" |
111 |
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}" |
112 |
|
113 |
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN} |
114 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
115 |
|
116 |
src_unpack() { |
117 |
tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die |
118 |
} |
119 |
|
120 |
src_prepare() { |
121 |
+ default |
122 |
# remove -Werror from build, bug #545398 |
123 |
sed -i 's/-Werror[^ ]* //g' configure.ac || die |
124 |
|
125 |
- default |
126 |
- |
127 |
eautoreconf |
128 |
} |
129 |
|
130 |
src_configure() { |
131 |
econf \ |
132 |
- $(use_enable static-libs static) \ |
133 |
+ --disable-static \ |
134 |
$(use tcpd || echo --without-tcp-wrappers) \ |
135 |
- --with-usbids-dir=/usr/share/misc |
136 |
+ --with-usbids-dir="${EPREFIX}"/usr/share/misc |
137 |
} |
138 |
|
139 |
src_install() { |
140 |
default |
141 |
- prune_libtool_files |
142 |
+ find "${ED}" -name '*.la' -delete || die |
143 |
} |
144 |
|
145 |
pkg_postinst() { |