Browse Source

lvm2: adapted no_dynamic patch to the currenct version

early
Alejandro Mery 17 years ago
parent
commit
54cf136a84
  1. 51
      base/lvm2/no_dynamic.diff

51
base/lvm2/no_dynamic.diff

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../lvm2/no_dynamic.diff
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -26,8 +26,8 @@
all: $(SUBDIRS) $(TARGETS)
--- ./tools/Makefile.in.orig 2007-03-30 17:00:26.000000000 -0400
+++ ./tools/Makefile.in 2007-05-17 19:56:45.000000000 -0400
--- ./tools/Makefile.in.orig 2008-09-04 15:57:21.000000000 -0400
+++ ./tools/Makefile.in 2008-09-04 16:04:57.000000000 -0400
@@ -67,11 +67,10 @@
vgsplit.c
@ -52,45 +52,40 @@
INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS)
endif
--- ./tools/Makefile.in.orig 2007-07-18 20:11:11.000000000 -0400
+++ ./tools/Makefile.in 2007-07-18 20:12:41.000000000 -0400
@@ -105,7 +105,7 @@
@@ -103,7 +103,7 @@
LIB_PTHREAD = @LIB_PTHREAD@
lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
- $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+ $(LDFLAGS) $(LVMLIBS) $(LIBS)
- $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+ $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD)
liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
cat $(top_srcdir)/lib/liblvm.a > $@
--- ./configure.orig 2007-07-18 20:19:25.000000000 -0400
+++ ./configure 2007-07-18 20:19:44.000000000 -0400
@@ -1948,7 +1948,6 @@
@@ -166,6 +166,6 @@
install_tools_static: lvm.static
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
- $(staticdir)/lvm.static
+ $(staticdir)/lvm
install: $(INSTALL_TARGETS)
--- ./configure.orig 2008-06-27 15:57:27.000000000 -0400
+++ ./configure 2008-09-04 16:10:34.000000000 -0400
@@ -1958,7 +1958,6 @@
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LDDEPS="$LDDEPS .export.sym"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
LIB_SUFFIX="so"
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
--- ./configure.in.orig 2007-07-18 20:22:31.000000000 -0400
+++ ./configure.in 2007-07-18 20:22:42.000000000 -0400
@@ -37,7 +37,6 @@
--- ./configure.in.orig 2008-09-04 16:07:39.000000000 -0400
+++ ./configure.in 2008-09-04 16:10:10.000000000 -0400
@@ -33,7 +33,6 @@
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LDDEPS="$LDDEPS .export.sym"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
LIB_SUFFIX="so"
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
--- ./tools/Makefile.in.orig 2007-10-11 16:19:43.000000000 -0400
+++ ./tools/Makefile.in 2007-10-11 16:20:25.000000000 -0400
@@ -170,7 +170,7 @@
install_tools_static: lvm.static
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
- $(staticdir)/lvm.static
+ $(staticdir)/lvm
install: $(INSTALL_TARGETS)

Loading…
Cancel
Save