Skip to content

Commit 56952c8

Browse files
committed
x11-plugins/wmSMPmon: fix build with -fno-common
Closes: https://bugs.gentoo.org/707812 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli <[email protected]>
1 parent 0350cf0 commit 56952c8

File tree

2 files changed

+45
-2
lines changed

2 files changed

+45
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff -Naur wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h wmSMPmon-3.1/wmgeneral/wmgeneral.h
2+
--- wmSMPmon-3.1.orig/wmgeneral/wmgeneral.h 1999-04-25 05:08:22.000000000 +0200
3+
+++ wmSMPmon-3.1/wmgeneral/wmgeneral.h 2020-03-29 13:32:55.253627166 +0200
4+
@@ -36,7 +36,7 @@
5+
/* Global variable */
6+
/*******************/
7+
8+
-Display *display;
9+
+extern Display *display;
10+
11+
/***********************/
12+
/* Function Prototypes */
13+
diff -Naur wmSMPmon-3.1.orig/wmSMPmon/standards.h wmSMPmon-3.1/wmSMPmon/standards.h
14+
--- wmSMPmon-3.1.orig/wmSMPmon/standards.h 2004-11-19 14:57:30.000000000 +0100
15+
+++ wmSMPmon-3.1/wmSMPmon/standards.h 2020-03-29 13:32:14.666639432 +0200
16+
@@ -37,7 +37,7 @@
17+
#define HAUTEUR 31 /* Max. height of CPU Load Bar+Graph */
18+
19+
/* Program name used in error messages */
20+
-char *Myname;
21+
+extern char *Myname;
22+
23+
/* NumCPUs_DoInit returns the number of CPUs present in the system and
24+
performs any initialization necessary for the sysinfo-XXX module */
25+
diff -Naur wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c wmSMPmon-3.1/wmSMPmon/wmSMPmon.c
26+
--- wmSMPmon-3.1.orig/wmSMPmon/wmSMPmon.c 2005-11-07 01:24:32.000000000 +0100
27+
+++ wmSMPmon-3.1/wmSMPmon/wmSMPmon.c 2020-03-29 13:33:03.630624637 +0200
28+
@@ -35,6 +35,8 @@
29+
/*###### Funcition definitions ##########################################*/
30+
void usage(int cpus, const char *str);
31+
32+
+char *Myname;
33+
+Display *display;
34+
35+
/*###### MAIN PROGRAM ###################################################*/
36+
int main(int argc, char **argv)

x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2018 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
@@ -22,10 +22,17 @@ DEPEND="${RDEPEND}
2222

2323
DOCS=( ../Changelog )
2424

25-
S="${WORKDIR}/${P}/${PN}"
25+
S=${WORKDIR}/${P}/${PN}
2626

2727
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
2828

29+
src_prepare() {
30+
default
31+
32+
pushd "${WORKDIR}"/${P} || die
33+
eapply "${FILESDIR}"/${P}-fno-common.patch
34+
}
35+
2936
src_compile() {
3037
emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
3138
}

0 commit comments

Comments
 (0)