From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 14 Jun 2010 11:36:49 +0000 (+0000)
Subject: - X11_LIBS before LDFLAGS or --as-needed kicks our ass
X-Git-Tag: auto/th/nvidia-settings-195_36_31-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnvidia-settings.git;a=commitdiff_plain;h=d0365b000efdcd7a8808bb020978ef681ca6f2c4

- X11_LIBS before LDFLAGS or --as-needed kicks our ass

Changed files:
    nvidia-settings-xlibs.patch -> 1.3
---

diff --git a/nvidia-settings-xlibs.patch b/nvidia-settings-xlibs.patch
index d113e1a..8c258b2 100644
--- a/nvidia-settings-xlibs.patch
+++ b/nvidia-settings-xlibs.patch
@@ -1,5 +1,5 @@
---- nvidia-settings-1.0/Makefile~	2006-12-25 20:48:25.000000000 +0200
-+++ nvidia-settings-1.0/Makefile	2006-12-26 21:46:56.000000000 +0200
+--- nvidia-settings-1.0/Makefile	2006-12-26 21:46:56.000000000 +0200
++++ nvidia-settings-1.0/Makefile	2010-06-14 14:34:53.948906186 +0300
 @@ -118,7 +118,7 @@
  GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
  GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
@@ -9,3 +9,12 @@
  
  XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
  
+@@ -145,7 +145,7 @@
+ INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS))
+ 
+ ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
+-ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS)
++ALL_LDFLAGS = $(LD_RUN_FLAG) $(X11_LIBS) $(LDFLAGS) $(GTK_LDFLAGS)
+ 
+ CPPFLAGS = $(ALL_CFLAGS)
+