From 4d9fa115f60542f0fc2c03ac23518ae5997d897e Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 6 Aug 2010 21:09:36 +0200
Subject: [PATCH] libdevmapper: remove patch, --no-export-dynamic dosn't work
 with ld 2.19.1

---
 libdevmapper/Pkgfile                 |  7 ++-----
 libdevmapper/lvm2-static_build.patch | 21 ---------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 libdevmapper/lvm2-static_build.patch

diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile
index 0422a3fd..82e39c83 100644
--- a/libdevmapper/Pkgfile
+++ b/libdevmapper/Pkgfile
@@ -4,15 +4,12 @@
 
 name=libdevmapper
 version=1.02.53
-release=1
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.72.tgz 
-        lvm2-static_build.patch)
+release=2
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.72.tgz)
 
 build() {
     cd LVM2.2.02.72
 
-    patch -p1 -i $SRC/lvm2-static_build.patch
-
     ./configure --prefix=/usr \
                 --sbindir=/sbin \
                 --libdir=/lib \
diff --git a/libdevmapper/lvm2-static_build.patch b/libdevmapper/lvm2-static_build.patch
deleted file mode 100644
index 7791a896..00000000
--- a/libdevmapper/lvm2-static_build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in
---- LVM2.2.02.72.orig/tools/Makefile.in	2010-08-05 18:58:02.778823394 +0000
-+++ LVM2.2.02.72/tools/Makefile.in	2010-08-05 18:58:18.808671810 +0000
-@@ -126,7 +126,7 @@
- 	      -o $@ dmsetup.o -ldevmapper $(LIBS)
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \
- 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
-@@ -136,7 +136,7 @@
- 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \
- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
- 
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o