[gentoo-commits] gentoo-x86 commit in x11-misc/skippy/files: skippy-pointer-size.patch skippy-0.5.0-Makefile.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/02/06 20:52:14

  Modified:             skippy-pointer-size.patch
  Added:                skippy-0.5.0-Makefile.patch
  Log:
  Don't use LDFLAGS to pass libraries. Use CC variable instead of hardcoded gcc. Missing USE depend wrt #248579 by Kacper Kowalik.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  x11-misc/skippy/files/skippy-pointer-size.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/skippy/files/skippy-pointer-size.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/skippy/files/skippy-pointer-size.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/skippy/files/skippy-pointer-size.patch?r1=1.1&r2=1.2

Index: skippy-pointer-size.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/skippy/files/skippy-pointer-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skippy-pointer-size.patch	25 Jul 2005 23:20:40 -0000	1.1
+++ skippy-pointer-size.patch	6 Feb 2010 20:52:14 -0000	1.2
@@ -1,6 +1,5 @@
-diff -ur skippy-0.5.0/wm.c skippy-0.5.0.n/wm.c
---- skippy-0.5.0/wm.c	2005-07-20 01:27:23.000000000 +0200
-+++ skippy-0.5.0.n/wm.c	2005-07-20 01:28:48.000000000 +0200
+--- wm.c
++++ wm.c
 @@ -258,7 +258,7 @@
  		return 0;
  	



1.1                  x11-misc/skippy/files/skippy-0.5.0-Makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch?rev=1.1&content-type=text/plain

Index: skippy-0.5.0-Makefile.patch
===================================================================
Don't use LDFLAGS to pass libraries.

--- Makefile
+++ Makefile
@@ -1,14 +1,12 @@
-PREFIX = /usr/local
+PREFIX = /usr
 BINDIR = ${PREFIX}/bin
 
-X11PREFIX = /usr/X11R6
-
-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall
-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
+CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall
+LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
 
 # Comment these out to disable Xinerama support
 CFLAGS += -DXINERAMA
-LDFLAGS += -lXext -lXinerama
+LDLIBS += -lXext -lXinerama
 
 # Uncomment this for Xinerama debugging
 #CFLAGS += -DDEBUG
@@ -21,7 +19,7 @@
 all: skippy${EXESUFFIX}
 
 skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
-	gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
+	${CC} ${LDFLAGS} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDLIBS}
 
 clean:
 	rm -f skippy${EXESUFFIX}