sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (37a4596e9daa24bb1ffd8244a562ae2e28d14527)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (37a4596e9daa24bb1ffd8244a562ae2e28d14527)
Date: Tue, 31 Mar 2015 05:58:31 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/btrfs-progs/HISTORY | 3 +++
disk/btrfs-progs/PRE_BUILD | 4 ++++
2 files changed, 7 insertions(+)

New commits:
commit 37a4596e9daa24bb1ffd8244a562ae2e28d14527
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

btrfs-progs: respect system-wide flags

(cherry picked from commit 619d9efc32333458479883ab056dc886b4f27f1a)

diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 52ffddd..8080abf 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,6 @@
+2015-03-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: respect system-wide flags
+
2015-03-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: fixed the git branch fetching/updating

diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index df25ba6..d93cd14 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+# respect system-wide flags
+sedit "s:^CFLAGS =.*:CFLAGS = $CFLAGS:" Makefile &&
+sedit "s:^LDFLAGS =.*:LDFLAGS = $LDFLAGS:" Makefile &&
+
if ! is_depends_enabled $SPELL acl; then
sedit "s:btrfs-convert::g" Makefile
fi

[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (37a4596e9daa24bb1ffd8244a562ae2e28d14527), Vlad Glagolev, 03/31/2015