commit: 0e447f8ce622c2aa8af0edc96f3a9fec85746fa0 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Thu Apr 29 23:04:55 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 4 22:17:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e447f8c
net-wireless/bss: Respect CFLAGS Closes: https://bugs.gentoo.org/725228 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: Sam James <sam <AT> gentoo.org> .../bss/{bss-0.8-r1.ebuild => bss-0.8-r2.ebuild} | 18 +++++------- net-wireless/bss/files/bss-0.8-Makefile.patch | 34 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/net-wireless/bss/bss-0.8-r1.ebuild b/net-wireless/bss/bss-0.8-r2.ebuild similarity index 69% rename from net-wireless/bss/bss-0.8-r1.ebuild rename to net-wireless/bss/bss-0.8-r2.ebuild index 8747d82157c..c60a277a7b0 100644 --- a/net-wireless/bss/bss-0.8-r1.ebuild +++ b/net-wireless/bss/bss-0.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,20 +12,16 @@ SRC_URI="http://securitech.homeunix.org/blue/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" DEPEND="net-wireless/bluez" +RDEPEND="${DEPEND}" -src_prepare() { - default - sed -i -e 's:/local::' Makefile || die -} +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch +) -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - BSS_FLAGS="${LDFLAGS}" +src_configure() { + tc-export CC } src_install() { diff --git a/net-wireless/bss/files/bss-0.8-Makefile.patch b/net-wireless/bss/files/bss-0.8-Makefile.patch new file mode 100644 index 00000000000..6238ea6ae91 --- /dev/null +++ b/net-wireless/bss/files/bss-0.8-Makefile.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/725228 +--- a/Makefile ++++ b/Makefile +@@ -2,12 +2,10 @@ + # Pierre BETOUIN <pierre.beto...@security-labs.org> + # Modification Ollie Whitehouse <ol at uncon dot org> + +-CC=gcc +-MAKE=make +-CFLAGS=-Wall ++CFLAGS += -Wall + +-BINDIR=/usr/local/bin +-ETCDIR=/usr/local/etc ++BINDIR=/usr/bin ++ETCDIR=/usr/etc + + BSS_OBJ=bss + BSS_SRC=bss.c +@@ -22,10 +20,10 @@ BSS_LIBS=-lbluetooth + all: $(BSS_OBJ) + + $(BSS_OBJ): $(BSS_SRC) $(BSS_INC) +- $(CC) -c $(BSS_SRC) +- $(CC) -c $(L2P_SRC) +- $(CC) -c $(REP_SRC) +- $(CC) $(BSS_TMP) $(L2P_TMP) $(REP_TMP) -o $(BSS_OBJ) $(CFLAGS) $(BSS_FLAGS) $(BSS_LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(BSS_SRC) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(L2P_SRC) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(REP_SRC) ++ $(CC) $(LDFLAGS) $(BSS_TMP) $(L2P_TMP) $(REP_TMP) -o $(BSS_OBJ) $(CFLAGS) $(BSS_LIBS) + + install: + strip $(BSS_OBJ)
