|
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---# This copyright note is auto-generated by ./scripts/Create-CopyPatch.## Filename: package/.../lvm2/no_dynamic.diff# 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.## This patch file is dual-licensed. It is available under the license the# patched project is licensed under, as long as it is an OpenSource license# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms# of the GNU General Public License as published by the Free Software# Foundation; either version 2 of the License, or (at your option) any later# version.# --- SDE-COPYRIGHT-NOTE-END ---
--- ./make.tmpl.in.orig 2006-07-07 19:57:41.000000000 +0000
+++ ./make.tmpl.in 2006-07-07 19:58:24.000000000 +0000
@@ -110,7 +110,7 @@
SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.distclean := $(SUBDIRS:=.distclean) -TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+TARGETS += $(LIB_STATIC)
all: $(SUBDIRS) $(TARGETS) --- ./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 TARGETS =\- .commands \
- lvm
+ .commands
-INSTALL_TARGETS = install_tools_dynamic
-INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+INSTALL_TARGETS =
+INSTALL_CMDLIB_TARGETS =
ifeq ("@STATIC_LINK@", "yes") TARGETS += lvm.static@@ -87,7 +86,7 @@
lvmcmdlib.o lvm-static.o ifeq ("@CMDLIB@", "yes")- TARGETS += liblvm2cmd.so
+ TARGETS += liblvm2cmd.a
INSTALL_TARGETS += $(INSTALL_CMDLIB_TARGETS) endif @@ -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) $(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 > $@@@ -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 DEVMAPPER=yes ODIRECT=yes--- ./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 DEVMAPPER=yes ODIRECT=yes
|
