From 8440cb65bcf9b2cb3aa201b7f18e78b58144701e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
Date: Thu, 13 Jan 2011 20:54:20 +0100
Subject: [PATCH] LVM 2.02.28 fix

---
 gen_compile.sh                                     |   11 +++++++--
 .../lvm/2.02.28/filter-sysfs-inc-sys-stat.patch    |   11 ++++++++++
 patches/lvm/2.02.28/no-export-dynamic.patch        |   22 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
 create mode 100644 patches/lvm/2.02.28/no-export-dynamic.patch

diff --git a/gen_compile.sh b/gen_compile.sh
index 9b2da13..2be64e6 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -427,9 +427,12 @@ compile_lvm() {
 		apply_patches lvm ${LVM_VER}
 		print_info 1 'lvm: >> Configuring...'
 			LDFLAGS="-L${TEMP}/device-mapper/lib" \
-			CFLAGS="-I${TEMP}/device-mapper/include" \
-			CPPFLAGS="-I${TEMP}/device-mapper/include" \
-			./configure --enable-static_link --prefix=${TEMP}/lvm >> ${LOGFILE} 2>&1 ||
+			CFLAGS="-fPIC -I${TEMP}/device-mapper/include" \
+			CPPFLAGS="-fPIC -I${TEMP}/device-mapper/include" \
+			./configure --enable-static_link --prefix=${TEMP}/lvm \
+            --with-lvm1=none --with-clvmd=none --with-cluster=none \
+            --disable-readline --disable-selinux --with-mirrors=none \
+            --with-snapshots=none --with-pool=internal || \
 				gen_die 'Configure of lvm failed!'
 		print_info 1 'lvm: >> Compiling...'
 			compile_generic '' utils
@@ -506,6 +509,8 @@ compile_device_mapper() {
 		[ ! -d "${DEVICE_MAPPER_DIR}" ] &&
 			gen_die "device-mapper directory ${DEVICE_MAPPER_DIR} invalid"
 		cd "${DEVICE_MAPPER_DIR}"
+        CFLAGS="-fPIC" \
+        CPPFLAGS="-fPIC" \
 		./configure --prefix=${TEMP}/device-mapper --enable-static_link \
 			--disable-selinux >> ${LOGFILE} 2>&1 ||
 			gen_die 'Configuring device-mapper failed!'
diff --git a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch b/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
new file mode 100644
index 0000000..2988e92
--- /dev/null
+++ b/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
@@ -0,0 +1,11 @@
+diff -ur LVM2.2.02.28/lib/filters/filter-sysfs.c LVM2.2.02.28.new/lib/filters/filter-sysfs.c
+--- LVM2.2.02.28/lib/filters/filter-sysfs.c	2007-08-22 16:38:16.000000000 +0200
++++ LVM2.2.02.28.new/lib/filters/filter-sysfs.c	2011-01-13 20:45:38.751542669 +0100
+@@ -15,6 +15,7 @@
+ #include "lib.h"
+ #include "filter-sysfs.h"
+ #include "lvm-string.h"
++#include <sys/stat.h>
+ 
+ #ifdef linux
+ 
diff --git a/patches/lvm/2.02.28/no-export-dynamic.patch b/patches/lvm/2.02.28/no-export-dynamic.patch
new file mode 100644
index 0000000..19a4e13
--- /dev/null
+++ b/patches/lvm/2.02.28/no-export-dynamic.patch
@@ -0,0 +1,22 @@
+diff -ur LVM2.2.02.28/configure LVM2.2.02.28.new/configure
+--- LVM2.2.02.28/configure	2007-08-14 20:58:30.000000000 +0200
++++ LVM2.2.02.28.new/configure	2011-01-13 20:45:08.429184861 +0100
+@@ -1949,7 +1949,6 @@
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+ 		LDDEPS="$LDDEPS .export.sym"
+-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 		LIB_SUFFIX="so"
+ 		DEVMAPPER=yes
+ 		ODIRECT=yes
+diff -ur LVM2.2.02.28/configure.in LVM2.2.02.28.new/configure.in
+--- LVM2.2.02.28/configure.in	2007-08-14 20:58:31.000000000 +0200
++++ LVM2.2.02.28.new/configure.in	2011-01-13 20:45:14.365688659 +0100
+@@ -38,7 +38,6 @@
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+ 		LDDEPS="$LDDEPS .export.sym"
+-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 		LIB_SUFFIX="so"
+ 		DEVMAPPER=yes
+ 		ODIRECT=yes
-- 
1.7.4.rc1