Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40b6800770f3b493fa30f16913da3d7fde52220b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40b6800770f3b493fa30f16913da3d7fde52220b)
  • Date: Wed, 16 Mar 2016 17:45:34 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/lvm/HISTORY | 3 +++
disk/lvm/PRE_BUILD | 18 ++++++++++++++++++
2 files changed, 21 insertions(+)

New commits:
commit 40b6800770f3b493fa30f16913da3d7fde52220b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lvm: fix build static part

diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 4fb6a34..30ea877 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2016-03-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: added, to fix static linking again
+
2016-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.02.145
* lvm-static-hotfix.patch PRE_BUILD: deleted
diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
new file mode 100755
index 0000000..79fa080
--- /dev/null
+++ b/disk/lvm/PRE_BUILD
@@ -0,0 +1,18 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Please only remove that patch if it _really_ is not needed anymore.
+message "${MESSAGE_COLOR}Patching for breakage of static build \
+(presumably with --as-needed).$DEFAULT_COLOR" &&
+patch -p0 <<'EOT'
+--- tools/Makefile.in.orig 2016-03-16 17:32:09.859648238 +0100
++++ tools/Makefile.in 2016-03-16 17:35:31.807152952 +0100
+@@ -147,7 +147,7 @@
+
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a
$(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
$(PTHREAD_LIBS) -luuid
+
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
+ cat $(top_builddir)/lib/liblvm-internal.a > $@
+EOT



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (40b6800770f3b493fa30f16913da3d7fde52220b), Thomas Orgis, 03/16/2016

Archive powered by MHonArc 2.6.24.

Top of Page