summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-09-30 21:02:44 +0000
committerMike Frysinger <vapier@gentoo.org>2006-09-30 21:02:44 +0000
commit5bb4cecb66c02a4dcc6c12acde66eb0008b63d8c (patch)
tree3ef2ee1ee11a1a6025202ef264b010f1b10b2ba3 /sys-block/nbd
parentVersion bump. (diff)
downloadgentoo-2-5bb4cecb66c02a4dcc6c12acde66eb0008b63d8c.tar.gz
gentoo-2-5bb4cecb66c02a4dcc6c12acde66eb0008b63d8c.tar.bz2
gentoo-2-5bb4cecb66c02a4dcc6c12acde66eb0008b63d8c.zip
Fix up gznbd build to work with -Wl,--as-needed #149653 by Donnie Berkholz.
(Portage version: 2.1.2_pre2)
Diffstat (limited to 'sys-block/nbd')
-rw-r--r--sys-block/nbd/ChangeLog6
-rw-r--r--sys-block/nbd/files/nbd-2.8.2-gznbd.patch5
2 files changed, 7 insertions, 4 deletions
diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 98556f1229d9..8cc17e343da7 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/nbd
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.13 2006/09/26 04:45:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.14 2006/09/30 21:02:43 vapier Exp $
+
+ 30 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+ files/nbd-2.8.2-gznbd.patch:
+ Fix up gznbd build to work with -Wl,--as-needed #149653 by Donnie Berkholz.
*nbd-2.8.6 (26 Sep 2006)
diff --git a/sys-block/nbd/files/nbd-2.8.2-gznbd.patch b/sys-block/nbd/files/nbd-2.8.2-gznbd.patch
index 9d6514a9973f..57abf8554923 100644
--- a/sys-block/nbd/files/nbd-2.8.2-gznbd.patch
+++ b/sys-block/nbd/files/nbd-2.8.2-gznbd.patch
@@ -1,16 +1,15 @@
--- gznbd/Makefile
+++ gznbd/Makefile
-@@ -1,2 +1,8 @@
+@@ -1,2 +1,7 @@
-gznbd: gznbd.c
- gcc -s -Wall -O2 -DTRACE gznbd.c -o gznbd -lz
+CC ?= gcc
+CFLAGS ?= -s -O2
+CFLAGS += -Wall -DTRACE
-+LDFLAGS += -lz
++LDLIBS += -lz
+
+all: gznbd
+gznbd: gznbd.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
--- gznbd/gznbd.c
+++ gznbd/gznbd.c
@@ -49,8 +49,8 @@