Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/sgt-puzzles/files: sgt-puzzles-8605-gentoo.patch
Date: Fri, 11 Sep 2009 12:02:05
Message-Id: E1Mm4pG-0000TJ-IF@stork.gentoo.org
1 tupone 09/09/11 12:02:02
2
3 Added: sgt-puzzles-8605-gentoo.patch
4 Log:
5 Fix --as-needed as reported by Bug #281990
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/sgt-puzzles/files/sgt-puzzles-8605-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: sgt-puzzles-8605-gentoo.patch
15 ===================================================================
16 --- mkfiles.pl.old 2009-09-11 13:39:57.000000000 +0200
17 +++ mkfiles.pl 2009-09-11 13:44:40.000000000 +0200
18 @@ -1110,8 +1110,8 @@
19 "\n".
20 &splitline("CFLAGS = -O2 -Wall -Werror -ansi -pedantic -g " .
21 (join " ", map {"-I$dirpfx$_"} @srcdirs) .
22 - " `\$(GTK_CONFIG) --cflags`")."\n".
23 - "XLDFLAGS = `\$(GTK_CONFIG) --libs`\n".
24 + " `pkg-config gtk+-2.0 --cflags`")."\n".
25 + "XLDLIBS = `pkg-config gtk+-2.0 --libs`\n".
26 "ULDFLAGS =#\n".
27 "INSTALL=install\n",
28 "INSTALL_PROGRAM=\$(INSTALL)\n",
29 @@ -1130,8 +1130,13 @@
30 $objstr = &objects($p, "X.o", undef, undef);
31 print &splitline($prog . ": " . $objstr), "\n";
32 $libstr = &objects($p, undef, undef, "-lX");
33 - print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
34 - $objstr . " $libstr", 69), "\n\n";
35 + if ($type eq "X") {
36 + print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
37 + $objstr . " $libstr \$(XLDLIBS)", 69), "\n\n";
38 + } else {
39 + print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
40 + $objstr . " $libstr", 69), "\n\n";
41 + }
42 }
43 foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
44 print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),