summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2008-02-28 15:17:04 +0000
committerJim Ramsay <lack@gentoo.org>2008-02-28 15:17:04 +0000
commite13ccda6b402501acb6eb4a6e40062b616e775cd (patch)
treec1ebe3fcac46514681b7b499f725634da2b8fd87 /app-admin/gkrellm/files/gkrellm-2.3-build.patch
parentI keyworded the wrong ebuild (diff)
downloadgentoo-2-e13ccda6b402501acb6eb4a6e40062b616e775cd.tar.gz
gentoo-2-e13ccda6b402501acb6eb4a6e40062b616e775cd.tar.bz2
gentoo-2-e13ccda6b402501acb6eb4a6e40062b616e775cd.zip
Version bump - 2.3.1 is released (Bug #209937)
(Portage version: 2.1.4.1)
Diffstat (limited to 'app-admin/gkrellm/files/gkrellm-2.3-build.patch')
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3-build.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/app-admin/gkrellm/files/gkrellm-2.3-build.patch b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
new file mode 100644
index 000000000000..38de713aa64b
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3-build.patch
@@ -0,0 +1,58 @@
+--- server/Makefile
++++ server/Makefile
+@@ -21,7 +21,7 @@
+ MANMODE ?= 644
+ MANDIRMODE ?= 755
+ INSTALL ?= install
+-LINK_FLAGS ?= -Wl,-E
++LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
+ EXTRAOBJS =
+
+
+@@ -41,7 +41,7 @@
+
+
+ CC ?= gcc
+-STRIP ?= -s
++STRIP ?=
+
+ GKRELLMD_INCLUDES = gkrellmd.h
+
+@@ -51,7 +51,7 @@
+ GLIB12_INCLUDE = `glib-config --cflags`
+ GLIB12_LIB = `glib-config --libs glib gmodule`
+
+-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+ ifeq ($(glib12),1)
+ FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+ endif
+--- src/Makefile
++++ src/Makefile
+@@ -18,7 +18,7 @@
+ MANMODE ?= 644
+ MANDIRMODE ?= 755
+ INSTALL ?= install
+-LINK_FLAGS ?= -Wl,-E
++LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
+ SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
+
+ ifeq ($(without-gnutls),1)
+@@ -62,7 +62,7 @@
+ endif
+
+ CC ?= gcc
+-STRIP ?= -s
++STRIP ?=
+
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
+
+@@ -70,7 +70,7 @@
+
+ PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
+
+-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+ FLAGS+= $(PTHREAD_INC)
+
+ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)