Fix building with -Wl,--as-needed and respect LDFLAGS wrt #248605.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-plugins/docker/ChangeLog b/x11-plugins/docker/ChangeLog
index 062203c6da3a4b34905d061ef606ae2573536438..27bba6fbbf487001cc8eef9c03436b4b1c5ab229 100644 (file)
--- a/x11-plugins/docker/ChangeLog
+++ b/x11-plugins/docker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/docker
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.20 2008/09/22 13:08:03 omp Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.21 2010/03/29 11:00:02 ssuominen Exp $
+
+  29 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/docker-1.5-makefile.patch:
+  Fix building with -Wl,--as-needed and respect LDFLAGS wrt #248605.
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
   Change herd from commonbox to desktop-wm.

diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index ed3c8a4dbedfb922d8138ad121cadb7b1e8b98e0..44e81608db4c1b559028620e4aab081349eba21b 100644 (file)
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX docker-1.5-makefile.patch 1199 RMD160 1beaed4cc9f7feee11dba0e3020c4bac9855ff9e SHA1 026244ad6fd108f423633e2eec529082bdb3c0bd SHA256 66e188379e89ddf0655788fcfde12438f63869e7801aeec1c3fae88b7b255ac8
+AUX docker-1.5-makefile.patch 1437 RMD160 752d55b47403693af9719079d6192d610bcde557 SHA1 d6db89d3f2c43074cecbe6379ac5023c175c154e SHA256 7fc6f0ba34ecaf1d73de7c8c779e555b9dd50fb9782b274456a70e1da38a3837
 DIST docker-1.5.tar.gz 14863 RMD160 d36883acf4de5c2e97d478a7d29cb66645189748 SHA1 aff3e0c6103a7b1f190d4207868ae7c28d267304 SHA256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e
 EBUILD docker-1.5.ebuild 852 RMD160 fe3dde861de8667952f2e19f15d7bf7f1e249cff SHA1 57a2fc475a10a34523a5c676adfb386e3dbc9d9c SHA256 e8dc50d18b430ea41be485aec7482682ce4d457e542905f1d9177503d118f506
-MISC ChangeLog 2991 RMD160 2331dbeaa15765e204af38d4c9496faa2059c5f9 SHA1 9789dabf4be20268a47128df8e3bdd893bf7e501 SHA256 8cf6b1e164f17ccb1a3ff8e7fc0a64f78a086eb5571f7ba58dd5fbfd517961ba
+MISC ChangeLog 3156 RMD160 4bde9ed07d176405bd25b6b5fffecc6387fccf7b SHA1 b7e3b30741c6235f5b8baecce7aafd380d182a88 SHA256 230197e4cd3d05a7f7093108544519b78b383c27d5f39567693633b9345ee883
 MISC metadata.xml 268 RMD160 f5371bab877ec1c853306d41b1eb2df3a27c3f14 SHA1 52fa5d86fec8dd798419667f61dca8ae79005818 SHA256 5ecff30d76f59dcb11818950f8c003d97377af77c636f5e15424fabb3a543245
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjXmMEACgkQvSApE0uP4UvmQwCfVQwbhWzBvNIMb8piiMYRoH+3
-F9kAoJ/330dMkUevYZi6/ZblaUXj3UQt
-=PxzR
------END PGP SIGNATURE-----

diff --git a/x11-plugins/docker/files/docker-1.5-makefile.patch b/x11-plugins/docker/files/docker-1.5-makefile.patch
index 3a98da19455cdf2dc2b8144f00e00c588c4f394a..d788bb6304064a6dc5708fa999633afe0c38e1db 100644 (file)
--- a/x11-plugins/docker/files/docker-1.5-makefile.patch
+++ b/x11-plugins/docker/files/docker-1.5-makefile.patch
@@ -1,22 +1,21 @@
---- Makefile.orig       2002-11-20 11:20:49.000000000 +0100
-+++ Makefile   2008-01-27 20:14:14.000000000 +0100
-@@ -5,12 +5,12 @@
+--- Makefile.orig      2010-03-29 13:57:15.000000000 +0300
++++ Makefile   2010-03-29 13:59:11.000000000 +0300
+@@ -5,12 +5,10 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  
  # Change this PREFIX to where you want docker to be installed
 -PREFIX=/usr/local
-+PREFIX=/usr
- # Change this XLIBPATH to point to your X11 development package's installation
+-# Change this XLIBPATH to point to your X11 development package's installation
 -XLIBPATH=/usr/X11R6/lib
-+XLIBPATH=/usr/lib
++PREFIX = /usr
  
  # Sets some flags for stricter compiling
 -CFLAGS=-pedantic -Wall -W -O
-+CFLAGS+=-pedantic -Wall -W
++CFLAGS += -pedantic -Wall -W
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                 #
-@@ -24,7 +24,7 @@
+@@ -24,14 +22,14 @@
  target=docker
  sources=docker.c kde.c icons.c xproperty.c net.c
  headers=docker.h kde.h icons.h xproperty.h net.h version.h
@@ -25,7 +24,16 @@
  
  all: $(target) $(sources) $(headers)
        @echo Build Successful
-@@ -40,7 +40,8 @@
+ 
+ $(target): $(sources:.c=.o)
+-      $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+-              `pkg-config --libs glib-2.0` $^ -o $@
++      $(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
++              `pkg-config --libs glib-2.0` -o $@
+ 
+ %.o: %.c
+       $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
+@@ -40,7 +38,8 @@
        sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
  
  install: all