[gentoo-commits] gentoo-x86 commit in x11-misc/xcalib/files: xcalib-0.8-ldflags.patch

[Diego Petteno (flameeyes)]

flameeyes    08/04/14 11:36:53

  Added:                xcalib-0.8-ldflags.patch
  Log:
  Add a patch to respect LDFLAGS; fix broken dependencies; use the correct path for X11 (no more /usr/X11R6).
  (Portage version: 2.1.5_rc3)

Revision  Changes    Path
1.1                  x11-misc/xcalib/files/xcalib-0.8-ldflags.patch

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

Index: xcalib-0.8-ldflags.patch
===================================================================
Index: xcalib-0.8/Makefile
===================================================================
--- xcalib-0.8.orig/Makefile
+++ xcalib-0.8/Makefile
@@ -50,16 +50,16 @@ all: xcalib
 # low overhead version (internal parser)
 xcalib: xcalib.c
 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
-	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
+	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm
 
 fglrx_xcalib: xcalib.c
 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
-	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
+	$(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm
 
 win_xcalib: xcalib.c
 	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
 	windres.exe resource.rc resource.o
-	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
+	$(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
 
 install:
 	cp ./xcalib $(DESTDIR)/usr/local/bin/



-- 
gentoo-commits@l.g.o mailing list