1 |
commit: 8556ea8399e782d2c13a15719c58a153c645b3c6 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 25 13:03:18 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 25 13:28:31 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8556ea83 |
7 |
|
8 |
sys-block/open-isns: respect AR |
9 |
|
10 |
Closes: https://bugs.gentoo.org/721492 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
.../files/open-isns-0.100-respect-AR.patch | 30 ++++++++++++++++++++++ |
15 |
sys-block/open-isns/open-isns-0.100.ebuild | 2 ++ |
16 |
2 files changed, 32 insertions(+) |
17 |
|
18 |
diff --git a/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..66e52e54812 |
21 |
--- /dev/null |
22 |
+++ b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch |
23 |
@@ -0,0 +1,30 @@ |
24 |
+--- a/Makefile.in |
25 |
++++ b/Makefile.in |
26 |
+@@ -33,6 +33,7 @@ else |
27 |
+ SOLIB_VERSION_OPTS = |
28 |
+ endif |
29 |
+ |
30 |
++AR = @AR@ |
31 |
+ CC = @CC@ |
32 |
+ CPPFLAGS= @CPPFLAGS@ |
33 |
+ CFLAGS = @CFLAGS@ -I. -Iinclude -I$(srcdir) -I$(srcdir)/include |
34 |
+@@ -161,7 +162,7 @@ solib-message.o: message.c |
35 |
+ |
36 |
+ ifeq ($(BUILD_STATIC),1) |
37 |
+ $(LIB): $(LIBOBJS) |
38 |
+- ar cr $@ $(LIBOBJS) |
39 |
++ $(AR) cr $@ $(LIBOBJS) |
40 |
+ else |
41 |
+ $(LIB): |
42 |
+ endif |
43 |
+--- a/configure.ac |
44 |
++++ b/configure.ac |
45 |
+@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR([aclocal]) |
46 |
+ |
47 |
+ AC_CONFIG_HEADER(config.h) |
48 |
+ |
49 |
++AM_PROG_AR |
50 |
+ AC_PROG_CC |
51 |
+ AC_CANONICAL_HOST |
52 |
+ AC_C_BIGENDIAN |
53 |
+ |
54 |
|
55 |
diff --git a/sys-block/open-isns/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild |
56 |
index 878669c9073..63213dbfd79 100644 |
57 |
--- a/sys-block/open-isns/open-isns-0.100.ebuild |
58 |
+++ b/sys-block/open-isns/open-isns-0.100.ebuild |
59 |
@@ -25,6 +25,8 @@ RDEPEND="${DEPEND}" |
60 |
PATCHES=( |
61 |
"${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" |
62 |
|
63 |
+ "${FILESDIR}/${PN}-0.100-respect-AR.patch" |
64 |
+ |
65 |
# Upstream patches (can usually be removed with next version bump) |
66 |
"${FILESDIR}"/${P}-no_Werror.patch |
67 |
) |