From 5a2f8e82e4e907ae1c431a89b424fe5c84fda867 Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Thu, 29 Apr 2021 22:56:41 +0100 Subject: x11-misc/xbattbar: Respect CFLAGS Closes: https://bugs.gentoo.org/726278 Signed-off-by: Jakov Smolic Signed-off-by: Sam James --- .../xbattbar/files/xbattbar-1.4.5-Makefile.patch | 50 ++++++++++++++++++++++ x11-misc/xbattbar/files/xbattbar-1.4.5.patch | 40 ----------------- x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 23 ++++------ 3 files changed, 58 insertions(+), 55 deletions(-) create mode 100644 x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch delete mode 100644 x11-misc/xbattbar/files/xbattbar-1.4.5.patch (limited to 'x11-misc') diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch new file mode 100644 index 000000000000..0cd1ca00b44c --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch @@ -0,0 +1,50 @@ +--- a/Makefile ++++ b/Makefile +@@ -4,23 +4,23 @@ DESTDIR ?= / + + TARGET = xbattbar + APM_CHECK = xbattbar-check-apm +-CPPFLAGS = -D_FORTIFY_SOURCE=2 +-CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS) +-LDFLAGS = -Wl,-z,relro ++CPPFLAGS ?= -D_FORTIFY_SOURCE=2 ++CFLAGS ?= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security ++LDFLAGS ?= -Wl,-z,relro + + all: $(TARGET) $(APM_CHECK) + + $(TARGET): obj/xbattbar.o +- gcc -o $@ $< -lX11 $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) + + obj/xbattbar.o: xbattbar.c obj/stamp +- gcc -MMD -o $@ -c $< $(CFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -o $@ -c $< + + $(APM_CHECK): obj/xbattbar-check-apm.o +- gcc -o $@ $< $(LDFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< + + obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp +- gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< + + obj/stamp: + mkdir obj +@@ -32,12 +32,12 @@ clean: + + + install: $(TARGET) $(APM_CHECK) +- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) ++ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT) + install -d -m 0755 $(DESTDIR)/usr/bin + install -d -m 0755 $(DESTDIR)/usr/share/man/man1 +- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ +- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ +- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/ ++ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ ++ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ ++ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ + install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ + install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 + diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5.patch deleted file mode 100644 index 2602bb91187a..000000000000 --- a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,16 +11,16 @@ - all: $(TARGET) $(APM_CHECK) - - $(TARGET): obj/xbattbar.o -- gcc -o $@ $< -lX11 $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) - - obj/xbattbar.o: xbattbar.c obj/stamp -- gcc -MMD -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $< - - $(APM_CHECK): obj/xbattbar-check-apm.o -- gcc -o $@ $< $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - - obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp -- gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< - - obj/stamp: - mkdir obj -@@ -32,12 +32,12 @@ - - - install: $(TARGET) $(APM_CHECK) -- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) -+ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT) - install -d -m 0755 $(DESTDIR)/usr/bin - install -d -m 0755 $(DESTDIR)/usr/share/man/man1 -- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ -- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ -- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/ -+ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ -+ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ -+ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ - install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ - install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 - diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index 8d25691b09ab..660160d40073 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic multilib toolchain-funcs + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Advanced Power Management battery status display for X" HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html" @@ -14,16 +15,14 @@ KEYWORDS="amd64 ppc x86" DEPEND=" dev-lang/perl - x11-libs/libX11 -" + x11-libs/libX11" RDEPEND=" ${DEPEND} - !ppc? ( >=sys-power/acpi-1.5 ) -" + !ppc? ( >=sys-power/acpi-1.5 )" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.4.5.patch + "${FILESDIR}"/${PN}-1.4.5-Makefile.patch "${FILESDIR}"/${PN}-1.4.8-const.patch ) @@ -33,17 +32,11 @@ src_prepare() { sed -i \ -e "s:usr/lib:usr/$(get_libdir):" \ xbattbar.c || die - - tc-export PKG_CONFIG } -src_compile() { - use kernel_linux && append-flags -Dlinux - - emake \ - CC=$(tc-getCC) \ - LIBDIR="$(get_libdir)" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export CC PKG_CONFIG + use kernel_linux && append-cppflags -Dlinux } src_install() { -- cgit v1.2.3-65-gdbad