diff options
author | Jakov Smolic <jakov.smolic@sartura.hr> | 2020-11-26 11:32:36 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2020-11-26 11:32:36 +0100 |
commit | 7c1f5a1f4a79f5d2239904dab2689d515ba9d6ad (patch) | |
tree | ec95250d383e77ff58429954b167af3126890264 /x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch | |
parent | x11-wm/oroborus: fix build with gcc-10 (diff) | |
download | gentoo-7c1f5a1f4a79f5d2239904dab2689d515ba9d6ad.tar.gz gentoo-7c1f5a1f4a79f5d2239904dab2689d515ba9d6ad.tar.bz2 gentoo-7c1f5a1f4a79f5d2239904dab2689d515ba9d6ad.zip |
x11-plugins/gkwebmon: fix build with gcc-10
Closes: https://bugs.gentoo.org/707226
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch')
-rw-r--r-- | x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch new file mode 100644 index 000000000000..7b3ee50f5321 --- /dev/null +++ b/x11-plugins/gkwebmon/files/gkwebmon-0.2-cc-cflags-ldflags.patch @@ -0,0 +1,48 @@ +From ef7dcbf8495d03c8cf96d4fb30adf38b15e1ca74 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Mon, 29 Aug 2016 20:44:45 -0400 +Subject: [PATCH 1/1] Clean up variable usage in Makefile to support LDFLAGS + and friends. + +--- + Makefile | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index b422e79..d89977f 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,23 +3,19 @@ + + PLUGIN_DIR = /usr/local/lib/gkrellm2/plugins + +-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` +-GTK_LIB = `pkg-config gtk+-2.0 --libs` ++GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags) ++GTK_LIB = $(shell pkg-config gtk+-2.0 --libs) + + +-#FLAGS = -O2 -Wall -fPIC -std=c99 -pedantic $(GTK_INCLUDE) +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) +-LIBS = $(GTK_LIB) +- +-LFLAGS = -shared -lssl -lpthread +- +-CC = gcc $(CFLAGS) $(FLAGS) +-#CC = gcc -DDEBUG $(CFLAGS) $(FLAGS) ++CFLAGS += -Wall -fPIC ++CPPFLAGS += $(GTK_INCLUDE) ++LDLIBS += $(GTK_LIB) -lssl -lpthread ++LDFLAGS += -shared + + OBJS = webmon.o gk.o + + gkwebmon.so: $(OBJS) +- $(CC) $(OBJS) -o gkwebmon.so $(LFLAGS) $(LIBS) ++ $(CC) $(OBJS) -o $(@) $(LDFLAGS) $(LDLIBS) + + install: gkwebmon.so + install gkwebmon.so $(PLUGIN_DIR) +-- +2.7.3 + |