diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
commit | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch) | |
tree | 3ee550255947da075650f1a551dcc278f9a1b7f8 /x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch | |
parent | a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff) |
gentoo resync : 07.05.2021
Diffstat (limited to 'x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch')
-rw-r--r-- | x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch | 50 |
1 files changed, 50 insertions, 0 deletions
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 + |