mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
x11-plugins/gkrellm-countdown: new revision fixing HOMEPAGE and LDFLAGS.
This new revision fixes two bugs, both thanks to Michael Mair-Keimberger who posted patches to our bugzilla. The first is that the upstream build system did not support LDFLAGS -- it now does, with a patched Makefile. Michael also corrected the invalid HOMEPAGE variable, and added the ~amd64 keyword (which I am able to test). The ebuild has been updated to EAPI=6. Gentoo-Bug: 339657 Gentoo-Bug: 367171 Package-Manager: portage-2.2.28
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
This patch is by Michael Mair-Keimberger, as part of bug 339657. It
|
||||
teaches the Makefile to support the user's LDFLAGS.
|
||||
|
||||
Gentoo-Bug: 339657
|
||||
|
||||
--- a/Makefile 2003-12-30 23:07:29.000000000 +0100
|
||||
+++ b/Makefile 2013-03-16 14:23:47.671010566 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
IMLIB_LIB ?=
|
||||
PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
|
||||
|
||||
-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
|
||||
+FLAGS = -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
|
||||
LIBS = $(GTK_LIB) $(IMLIB_LIB)
|
||||
LFLAGS = -shared -lpthread
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
FLAGS += -DPACKAGE="\"$(PACKAGE)\""
|
||||
export PACKAGE LOCALEDIR
|
||||
|
||||
-CC ?= gcc
|
||||
-CC += $(CFLAGS) $(FLAGS)
|
||||
+
|
||||
+CC = $(CC)
|
||||
|
||||
INSTALL = install -c
|
||||
INSTALL_PROGRAM = $(INSTALL) -s
|
||||
@@ -32,8 +32,11 @@
|
||||
|
||||
all: $(BIN_FILENAME).so
|
||||
|
||||
+%.o: %.c
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
|
||||
+
|
||||
$(BIN_FILENAME).so: $(OBJS)
|
||||
- $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS)
|
||||
|
||||
clean:
|
||||
rm -f *.o core *.so* *.bak *~
|
||||
@@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit gkrellm-plugin
|
||||
|
||||
DESCRIPTION="A simple countdown clock for GKrellM2"
|
||||
SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
|
||||
HOMEPAGE="http://freecode.com/projects/gkrellm-countdown"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~ppc ~sparc ~x86 ~amd64"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="app-admin/gkrellm[X]"
|
||||
RDEPEND+=" ${COMMON_DEPEND}"
|
||||
DEPEND+=" ${COMMON_DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
Reference in New Issue
Block a user