diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
| commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
| tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /x11-plugins/gkrellmss/files | |
| parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) | |
gentoo resync : 12.05.2022
Diffstat (limited to 'x11-plugins/gkrellmss/files')
| -rw-r--r-- | x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch new file mode 100644 index 000000000000..a3eeae49cd56 --- /dev/null +++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch @@ -0,0 +1,61 @@ +Respect the user's pkg-config, don't call cc directly, respect CFLAGS +--- a/src/Makefile ++++ b/src/Makefile +@@ -7,9 +7,9 @@ endif + INSTALLDIR ?= $(INSTALLROOT)/lib/gkrellm2/plugins + INSTALL ?= install + +- +-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` +-GTK_LIB = `pkg-config gtk+-2.0 --libs` ++PKG_CONFIG ?= pkg-config ++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags) ++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs) + + OS_NAME=$(shell uname -s) + +@@ -92,7 +92,7 @@ ifeq ($(alsa),1) + FLAGS += -DGKRELLM_ALSA + endif + +-CC = gcc $(FLAGS) $(CFLAGS) ++CC = $(CC) + + OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o option.o + +@@ -101,7 +101,7 @@ all: gkrellmss.so + warn: ; $(WARN) + + gkrellmss.so: $(OBJS) warn +- $(CC) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS) ++ $(CC) $(FLAGS) $(CFLAGS) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS) + + + clean: +@@ -121,7 +121,12 @@ help: + @echo "" + + gkrellmss.o: gkrellmss.c gkrellmss.h configure ++ $(CC) $(CFLAGS) $(FLAGS) -c -o $@ $< + oscope.o: oscope.c gkrellmss.h configure ++ $(CC) $(CFLAGS) $(FLAGS) -c -o $@ $< + spectrum.o: spectrum.c gkrellmss.h configure ++ $(CC) $(CFLAGS) $(FLAGS) -c -o $@ $< + sdlib.o: sdlib.c gkrellmss.h sdlib-esd.c sdlib-alsa.c configure ++ $(CC) $(CFLAGS) $(FLAGS) -c -o $@ $< + option.o: option.c gkrellmss.h configure ++ $(CC) $(CFLAGS) $(FLAGS) -c -o $@ $< +--- a/src/configure ++++ b/src/configure +@@ -18,8 +18,9 @@ do + done + + +-PKG_INCLUDE=`pkg-config gtk+-2.0 --cflags` +-PKG_LIB=`pkg-config gtk+-2.0 --libs` ++PKG_CONFIG=${PKG_CONFIG-pkg-config} ++PKG_INCLUDE=$(${PKG_CONFIG} gtk+-2.0 --cflags) ++PKG_LIB=$(${PKG_CONFIG} gtk+-2.0 --libs) + + rm -f configure.h configure.log test test.o test.c + |