diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-plugins/bfm/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-plugins/bfm/files')
| -rw-r--r-- | x11-plugins/bfm/files/bfm-0.6.4-makefile.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch new file mode 100644 index 000000000000..ef47930c5dc5 --- /dev/null +++ b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch @@ -0,0 +1,66 @@ +--- Makefile.orig 2015-01-20 10:56:34.791157688 +0100 ++++ Makefile 2015-01-20 10:56:48.135154215 +0100 +@@ -26,21 +26,21 @@ + EXTRA += $(WMAN) + + # gtk cflags and gtk lib flags +-GTK_CFLAGS = $(shell gtk-config --cflags) ++GTK_CFLAGS += $(shell gtk-config --cflags) + GTK_LIBS = $(shell gtk-config --libs) + +-GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags) ++GTK2_CFLAGS += $(shell pkg-config gtk+-2.0 --cflags) + GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs) + + + # optimization cflags +-#CFLAGS = -O3 -Wall ${EXTRA} +-CFLAGS = ${EXTRA} ++#CFLAGS += -O3 -Wall ${EXTRA} ++CFLAGS += ${EXTRA} + + # profiling cflags +-# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO ++# CFLAGS += -ansi -Wall -pg -O3 ${EXTRA} -DPRO + # test coverage cflags +-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO ++# CFLAGS += -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO + + + SHELL = sh +@@ -53,9 +53,9 @@ + GKRELLM_SRCS = gkrellm-bfm.c + GKRELLM_OBJS = gkrellm-bfm.o + GKRELLM_BFM = gkrellm-bfm.so +-LDFLAGS = -shared -Wl ++LDFLAGS += -shared -Wl + +-STRIP = strip ++STRIP = true + + CC = gcc + +@@ -70,6 +70,7 @@ + else + CFLAGS+=-DNET_DEVICE=\"$(NET_DEVICE)\" + endif ++ LIBS = -lm -lX11 + SRCS += sys_linux.c + OBJS += sys_linux.o + INSTALL = -m 755 +@@ -129,12 +130,12 @@ + $(STRIP) $(GKRELLM_BFM) + + bubblefishymon: clean_obj +- $(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \ +- $(LIBS) $(GTK2_LIBS) $(SRCS) ++ $(CC) $(GTK2_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \ ++ $(LIBS) $(GTK2_LIBS) + $(STRIP) $(BUBBLEFISHYMON) + + bubblefishymon1: clean_obj +- $(CC) $(GTK_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \ ++ $(CC) $(GTK_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \ + $(LIBS) $(GTK_LIBS) $(SRCS) + $(STRIP) $(BUBBLEFISHYMON) + |