| 1 |
jer 09/04/02 06:02:43 |
| 2 |
|
| 3 |
Added: nvclock-0.8_beta4-flags.patch |
| 4 |
Log: |
| 5 |
Respect CC/CXX/CFLAGS/CXXFLAGS/LDFLAGS (bug #240846). Install and validate upstream desktop entry. |
| 6 |
(Portage version: 2.2_rc28/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/nvclock/files/nvclock-0.8_beta4-flags.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/files/nvclock-0.8_beta4-flags.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nvclock-0.8_beta4-flags.patch |
| 15 |
=================================================================== |
| 16 |
--- ./nvclock0.8b4/src/backend/Makefile.in.orig 2007-12-27 17:05:38.000000000 +0100 |
| 17 |
+++ ./nvclock0.8b4/src/backend/Makefile.in 2009-04-02 07:34:55.000000000 +0200 |
| 18 |
@@ -1,11 +1,10 @@ |
| 19 |
-CC=@CC@ -O0 |
| 20 |
AR=ar |
| 21 |
RANLIB=@RANLIB@ |
| 22 |
|
| 23 |
system=@system@ |
| 24 |
HAVE_NVCONTROL=@HAVE_NVCONTROL@ |
| 25 |
OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o |
| 26 |
-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol |
| 27 |
+CFLAGS+=@X11_CFLAGS@ -I../.. -I../nvcontrol |
| 28 |
|
| 29 |
ifeq ($(system), FreeBSD) |
| 30 |
OBJECTS+=back_bsd.o |
| 31 |
@@ -36,4 +35,4 @@ |
| 32 |
rm -f Makefile |
| 33 |
|
| 34 |
install: |
| 35 |
-uninstall: |
| 36 |
\ No newline at end of file |
| 37 |
+uninstall: |
| 38 |
--- ./nvclock0.8b4/src/gtk/Makefile.in.orig 2008-05-11 12:25:46.000000000 +0200 |
| 39 |
+++ ./nvclock0.8b4/src/gtk/Makefile.in 2009-04-02 07:34:55.000000000 +0200 |
| 40 |
@@ -1,7 +1,6 @@ |
| 41 |
-CC=@CC@ |
| 42 |
INSTALL=@INSTALL@ |
| 43 |
|
| 44 |
-CFLAGS=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. |
| 45 |
+CFLAGS+=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../.. |
| 46 |
HAVE_GTK2=@HAVE_GTK2@ |
| 47 |
HAVE_NVCONTROL=@HAVE_NVCONTROL@ |
| 48 |
libbackend=../backend/libbackend.a |
| 49 |
@@ -34,7 +33,7 @@ |
| 50 |
all: $(PROGRAM) |
| 51 |
|
| 52 |
nvclock_gtk: $(DEPS) $(OBJECTS) |
| 53 |
- $(CC) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS) |
| 54 |
+ $(CC) -o nvclock_gtk $(LDFLAGS) $(OBJECTS) $(libbackend) $(LIBS) |
| 55 |
|
| 56 |
clean: |
| 57 |
rm -f nvclock_gtk *.core *.o *.exe |
| 58 |
--- ./nvclock0.8b4/src/Makefile.in.orig 2009-01-03 18:02:54.000000000 +0100 |
| 59 |
+++ ./nvclock0.8b4/src/Makefile.in 2009-04-02 07:34:55.000000000 +0200 |
| 60 |
@@ -1,4 +1,3 @@ |
| 61 |
-CC=@CC@ |
| 62 |
INSTALL=@INSTALL@ |
| 63 |
|
| 64 |
nvclock_SOURCES=nvclock.c |
| 65 |
@@ -31,10 +30,10 @@ |
| 66 |
|
| 67 |
|
| 68 |
nvclock: $(DEPS) $(LIB) nvclock.c |
| 69 |
- $(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS) |
| 70 |
+ $(CC) -o nvclock $(CFLAGS) $(LDFLAGS) $(nvclock_SOURCES) $(INCLUDES) $(LIBS) |
| 71 |
|
| 72 |
smartdimmer: $(DEPS) $(LIB) smartdimmer.c |
| 73 |
- $(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) |
| 74 |
+ $(CC) -o smartdimmer $(CFLAGS) $(LDFLAGS) $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS) |
| 75 |
|
| 76 |
|
| 77 |
clean: clean-recursive clean-app |
| 78 |
--- ./nvclock0.8b4/src/nvcontrol/Makefile.in.orig 2005-12-09 20:46:05.000000000 +0100 |
| 79 |
+++ ./nvclock0.8b4/src/nvcontrol/Makefile.in 2009-04-02 07:36:58.000000000 +0200 |
| 80 |
@@ -1,8 +1,7 @@ |
| 81 |
-CC=@CC@ |
| 82 |
AR=ar |
| 83 |
RANLIB=@RANLIB@ |
| 84 |
system=@system@ |
| 85 |
-CFLAGS=@X11_CFLAGS@ -I../backend |
| 86 |
+CFLAGS+=@X11_CFLAGS@ -I../backend |
| 87 |
HAVE_X11=@HAVE_NVCONTROL@ |
| 88 |
OBJECTS=libnvcontrol.o nvcontrol.o |
| 89 |
|
| 90 |
@@ -26,4 +25,4 @@ |
| 91 |
rm -f Makefile |
| 92 |
|
| 93 |
install: |
| 94 |
-uninstall: |
| 95 |
\ No newline at end of file |
| 96 |
+uninstall: |
| 97 |
--- ./nvclock0.8b4/src/qt/Makefile.in.orig 2008-05-11 12:25:46.000000000 +0200 |
| 98 |
+++ ./nvclock0.8b4/src/qt/Makefile.in 2009-04-02 07:39:37.000000000 +0200 |
| 99 |
@@ -1,9 +1,8 @@ |
| 100 |
-CXX=@CXX@ |
| 101 |
INSTALL=@INSTALL@ |
| 102 |
MOC=@MOC@ |
| 103 |
|
| 104 |
OBJECTS=main.o qt_nvclock.o qt_nvclock.moc.o qt_xfree.o qt_xfree.moc.o |
| 105 |
-CXXFLAGS=@QT_CFLAGS@ -I../backend |
| 106 |
+CXXFLAGS+=@QT_CFLAGS@ -I../backend |
| 107 |
HAVE_NVCONTROL=@HAVE_NVCONTROL@ |
| 108 |
HAVE_QT=@HAVE_QT@ |
| 109 |
libbackend=../backend/libbackend.a |
| 110 |
@@ -32,7 +31,7 @@ |
| 111 |
all: $(PROGRAM) |
| 112 |
|
| 113 |
nvclock_qt: $(DEPS) qt_nvclock.moc qt_xfree.moc $(OBJECTS) |
| 114 |
- $(CXX) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS) |
| 115 |
+ $(CXX) -o nvclock_qt $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) |
| 116 |
|
| 117 |
clean: |
| 118 |
rm -f nvclock_qt *.core *.moc *.o |
Archives