| diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in |
| --- LVM2.2.02.92.orig/configure.in 2012-02-20 11:36:27.000000000 -0800 |
| +++ LVM2.2.02.92/configure.in 2012-02-20 15:53:40.700124222 -0800 |
| @@ -32,6 +32,7 @@ |
| COPTIMISE_FLAG="-O2" |
| CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" |
| ELDFLAGS="-Wl,--export-dynamic" |
| + STATIC_LDFLAGS="-Wl,--no-export-dynamic" |
| # FIXME Generate list and use --dynamic-list=.dlopen.sym |
| CLDWHOLEARCHIVE="-Wl,-whole-archive" |
| CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" |
| @@ -1458,6 +1459,7 @@ |
| AC_SUBST(SELINUX_PC) |
| AC_SUBST(SNAPSHOTS) |
| AC_SUBST(STATICDIR) |
| +AC_SUBST(STATIC_LDFLAGS) |
| AC_SUBST(STATIC_LINK) |
| AC_SUBST(TESTING) |
| AC_SUBST(THIN) |
| diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in |
| --- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in 2012-02-20 15:48:04.861683196 -0800 |
| +++ LVM2.2.02.92/daemons/dmeventd/Makefile.in 2012-02-20 15:52:50.732314588 -0800 |
| @@ -65,7 +65,7 @@ |
| $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic |
| |
| dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a |
| - $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ |
| + $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ |
| dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS) |
| |
| ifeq ("@PKGCONFIG@", "yes") |
| diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in |
| --- LVM2.2.02.92.orig/make.tmpl.in 2012-02-20 15:48:05.034685963 -0800 |
| +++ LVM2.2.02.92/make.tmpl.in 2012-02-20 15:48:58.622550855 -0800 |
| @@ -38,6 +38,7 @@ |
| ELDFLAGS += @ELDFLAGS@ |
| LDDEPS += @LDDEPS@ |
| LDFLAGS += @LDFLAGS@ |
| +STATIC_LDFLAGS += @STATIC_LDFLAGS@ |
| LIB_SUFFIX = @LIB_SUFFIX@ |
| LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS) |
| DL_LIBS = @DL_LIBS@ |
| diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in |
| --- LVM2.2.02.92.orig/tools/Makefile.in 2011-11-14 13:30:36.000000000 -0800 |
| +++ LVM2.2.02.92/tools/Makefile.in 2012-02-20 15:52:25.242901501 -0800 |
| @@ -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) $(STATIC_LDFLAGS) -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) $(STATIC_LDFLAGS) -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 |
