1 |
commit: 0e447f8ce622c2aa8af0edc96f3a9fec85746fa0 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Thu Apr 29 23:04:55 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 4 22:17:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e447f8c |
7 |
|
8 |
net-wireless/bss: Respect CFLAGS |
9 |
|
10 |
Closes: https://bugs.gentoo.org/725228 |
11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../bss/{bss-0.8-r1.ebuild => bss-0.8-r2.ebuild} | 18 +++++------- |
15 |
net-wireless/bss/files/bss-0.8-Makefile.patch | 34 ++++++++++++++++++++++ |
16 |
2 files changed, 41 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/net-wireless/bss/bss-0.8-r1.ebuild b/net-wireless/bss/bss-0.8-r2.ebuild |
19 |
similarity index 69% |
20 |
rename from net-wireless/bss/bss-0.8-r1.ebuild |
21 |
rename to net-wireless/bss/bss-0.8-r2.ebuild |
22 |
index 8747d82157c..c60a277a7b0 100644 |
23 |
--- a/net-wireless/bss/bss-0.8-r1.ebuild |
24 |
+++ b/net-wireless/bss/bss-0.8-r2.ebuild |
25 |
@@ -1,4 +1,4 @@ |
26 |
-# Copyright 1999-2018 Gentoo Foundation |
27 |
+# Copyright 1999-2021 Gentoo Authors |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
EAPI=7 |
31 |
@@ -12,20 +12,16 @@ SRC_URI="http://securitech.homeunix.org/blue/${P}.tar.gz" |
32 |
LICENSE="GPL-2" |
33 |
SLOT="0" |
34 |
KEYWORDS="~amd64 ~ppc ~x86" |
35 |
-IUSE="" |
36 |
|
37 |
DEPEND="net-wireless/bluez" |
38 |
+RDEPEND="${DEPEND}" |
39 |
|
40 |
-src_prepare() { |
41 |
- default |
42 |
- sed -i -e 's:/local::' Makefile || die |
43 |
-} |
44 |
+PATCHES=( |
45 |
+ "${FILESDIR}"/${P}-Makefile.patch |
46 |
+) |
47 |
|
48 |
-src_compile() { |
49 |
- emake \ |
50 |
- CC="$(tc-getCC)" \ |
51 |
- CFLAGS="${CFLAGS}" \ |
52 |
- BSS_FLAGS="${LDFLAGS}" |
53 |
+src_configure() { |
54 |
+ tc-export CC |
55 |
} |
56 |
|
57 |
src_install() { |
58 |
|
59 |
diff --git a/net-wireless/bss/files/bss-0.8-Makefile.patch b/net-wireless/bss/files/bss-0.8-Makefile.patch |
60 |
new file mode 100644 |
61 |
index 00000000000..6238ea6ae91 |
62 |
--- /dev/null |
63 |
+++ b/net-wireless/bss/files/bss-0.8-Makefile.patch |
64 |
@@ -0,0 +1,34 @@ |
65 |
+https://bugs.gentoo.org/725228 |
66 |
+--- a/Makefile |
67 |
++++ b/Makefile |
68 |
+@@ -2,12 +2,10 @@ |
69 |
+ # Pierre BETOUIN <pierre.betouin@×××××××××××××.org> |
70 |
+ # Modification Ollie Whitehouse <ol at uncon dot org> |
71 |
+ |
72 |
+-CC=gcc |
73 |
+-MAKE=make |
74 |
+-CFLAGS=-Wall |
75 |
++CFLAGS += -Wall |
76 |
+ |
77 |
+-BINDIR=/usr/local/bin |
78 |
+-ETCDIR=/usr/local/etc |
79 |
++BINDIR=/usr/bin |
80 |
++ETCDIR=/usr/etc |
81 |
+ |
82 |
+ BSS_OBJ=bss |
83 |
+ BSS_SRC=bss.c |
84 |
+@@ -22,10 +20,10 @@ BSS_LIBS=-lbluetooth |
85 |
+ all: $(BSS_OBJ) |
86 |
+ |
87 |
+ $(BSS_OBJ): $(BSS_SRC) $(BSS_INC) |
88 |
+- $(CC) -c $(BSS_SRC) |
89 |
+- $(CC) -c $(L2P_SRC) |
90 |
+- $(CC) -c $(REP_SRC) |
91 |
+- $(CC) $(BSS_TMP) $(L2P_TMP) $(REP_TMP) -o $(BSS_OBJ) $(CFLAGS) $(BSS_FLAGS) $(BSS_LIBS) |
92 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(BSS_SRC) |
93 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(L2P_SRC) |
94 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(REP_SRC) |
95 |
++ $(CC) $(LDFLAGS) $(BSS_TMP) $(L2P_TMP) $(REP_TMP) -o $(BSS_OBJ) $(CFLAGS) $(BSS_LIBS) |
96 |
+ |
97 |
+ install: |
98 |
+ strip $(BSS_OBJ) |