1 |
jer 11/01/03 03:48:31 |
2 |
|
3 |
Added: nvclock-0.8_p20110102-make.patch |
4 |
Log: |
5 |
Version bump (happens to fix bug #350328). Clean up ebuild. Merge all patches into one and fix parallel make by adding two new targets. |
6 |
|
7 |
(Portage version: 2.2.0_alpha11/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: nvclock-0.8_p20110102-make.patch |
16 |
=================================================================== |
17 |
- Fix building with --as-needed |
18 |
- Fix parallel make by defining two new targets |
19 |
- Fix one spelling error |
20 |
- Respect LDFLAGS |
21 |
|
22 |
--- a/configure.in 2011-01-02 19:48:13.000000000 +0100 |
23 |
+++ b/configure.in 2011-01-03 04:35:34.000000000 +0100 |
24 |
@@ -141,7 +141,7 @@ |
25 |
if [test "$HAVE_NVCONTROL" = "yes"]; then |
26 |
echo "- NV-CONTROL support enabled" |
27 |
else |
28 |
- echo "- NV-CONROL support disabled" |
29 |
+ echo "- NV-CONTROL support disabled" |
30 |
fi |
31 |
if [test "$HAVE_GTK2" = "yes"]; then |
32 |
echo "- GTK2 GUI enabled" |
33 |
--- a/src/Makefile.in 2011-01-02 19:48:13.000000000 +0100 |
34 |
+++ b/src/Makefile.in 2011-01-03 04:35:34.000000000 +0100 |
35 |
@@ -16,7 +16,7 @@ |
36 |
ifeq ($(HAVE_NVCONTROL), yes) |
37 |
DEPS=$(libbackend) $(libnvcontrol) |
38 |
INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. |
39 |
- LIBS=@X11_LIBS@ -L./backend -lbackend -L./nvcontrol -lnvcontrol |
40 |
+ LIBS=-L./backend -lbackend -L./nvcontrol -lnvcontrol @X11_LIBS@ |
41 |
else |
42 |
DEPS=$(libbackend) |
43 |
INCLUDES=-I./backend -I./nvcontrol -I.. |
44 |
@@ -30,12 +30,17 @@ |
45 |
|
46 |
all: all-recursive nvclock smartdimmer |
47 |
|
48 |
+$(libbackend): |
49 |
+ $(MAKE) -C backend |
50 |
+ |
51 |
+$(libnvcontrol): |
52 |
+ $(MAKE) -C nvcontrol |
53 |
|
54 |
nvclock: $(DEPS) $(LIB) nvclock.c |
55 |
- $(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) |
56 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) |
57 |
|
58 |
smartdimmer: $(DEPS) $(LIB) smartdimmer.c |
59 |
- $(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) |
60 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) |
61 |
|
62 |
|
63 |
clean: clean-recursive clean-app |
64 |
--- a/src/gtk/Makefile.in 2011-01-02 19:48:13.000000000 +0100 |
65 |
+++ b/src/gtk/Makefile.in 2011-01-03 04:35:34.000000000 +0100 |
66 |
@@ -33,7 +33,7 @@ |
67 |
all: $(PROGRAM) |
68 |
|
69 |
nvclock_gtk: $(DEPS) $(OBJECTS) |
70 |
- $(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS) |
71 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS) |
72 |
|
73 |
clean: |
74 |
rm -f nvclock_gtk *.core *.o *.exe |
75 |
--- a/src/qt/Makefile.in 2011-01-02 19:48:13.000000000 +0100 |
76 |
+++ b/src/qt/Makefile.in 2011-01-03 04:35:34.000000000 +0100 |
77 |
@@ -31,7 +31,7 @@ |
78 |
all: $(PROGRAM) |
79 |
|
80 |
nvclock_qt: $(DEPS) qt_nvclock.moc qt_xfree.moc $(OBJECTS) |
81 |
- $(CXX) $(CXXFLAGS) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS) |
82 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o nvclock_qt $(OBJECTS) $(LIBS) |
83 |
|
84 |
clean: |
85 |
rm -f nvclock_qt *.core *.moc *.o |