Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (336c59fab4bc5da25a878791531480d4feb517dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (336c59fab4bc5da25a878791531480d4feb517dd)
  • Date: Thu, 30 Apr 2015 16:16:19 -0500

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

disk/btrfs-progs/BUILD | 5 -----
disk/btrfs-progs/DEPENDS | 16 ++++++++++++++--
disk/btrfs-progs/DETAILS | 2 +-
disk/btrfs-progs/HISTORY | 7 +++++++
disk/btrfs-progs/INSTALL | 9 +++++----
disk/btrfs-progs/PRE_BUILD | 8 ++------
6 files changed, 29 insertions(+), 18 deletions(-)

New commits:
commit 336c59fab4bc5da25a878791531480d4feb517dd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/btrfs-progs: version 4.0

diff --git a/disk/btrfs-progs/BUILD b/disk/btrfs-progs/BUILD
deleted file mode 100755
index a9b8577..0000000
--- a/disk/btrfs-progs/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-if is_depends_enabled $SPELL xmlto; then
- make BUILD_VERBOSE=1
-else
- make BUILD_VERBOSE=1 DISABLE_DOCUMENTATION=1
-fi
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
index 21c38f4..dfb82a2 100755
--- a/disk/btrfs-progs/DEPENDS
+++ b/disk/btrfs-progs/DEPENDS
@@ -2,14 +2,26 @@ depends zlib &&
depends util-linux &&
depends lzo &&

-optional_depends acl "" "" "for btrfs-convert utility" &&
+optional_depends acl \
+ "--enable-convert" \
+ "--disable-convert" \
+ "for btrfs-convert utility" &&

if is_depends_enabled $SPELL acl; then
depends e2fsprogs
fi &&

-optional_depends xmlto "" "" "to build documentation" &&
+optional_depends xmlto \
+ "--enable-documentation" \
+ "--disable-documentation" \
+ "to build documentation" &&

if is_depends_enabled $SPELL xmlto; then
depends asciidoc
+fi &&
+
+if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
+ depends autoconf &&
+ depends automake &&
+ depends git
fi
diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index b97d3e8..66b83d4 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=3.18.2
+ VERSION=4.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 8080abf..2021db7 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,10 @@
+2015-04-30 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 4.0
+ * BUILD: removed
+ * DEPENDS: added flags for acl and xmlto, also added autoconf,
+ automake and git for scm branch
+ * INSTALL: added libdir with suffix, removed xmlto check
+
2015-03-31 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: respect system-wide flags

diff --git a/disk/btrfs-progs/INSTALL b/disk/btrfs-progs/INSTALL
index 3593c7d..da8bbc0 100755
--- a/disk/btrfs-progs/INSTALL
+++ b/disk/btrfs-progs/INSTALL
@@ -1,5 +1,6 @@
-if is_depends_enabled $SPELL xmlto; then
- make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/sbin install
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ suffix="64"
else
- make DISABLE_DOCUMENTATION=1 DESTDIR="$INSTALL_ROOT" prefix=/usr
bindir=/sbin install
-fi
+ suffix=""
+fi &&
+make DESTDIR="$INSTALL_ROOT" prefix=/usr bindir=/sbin libdir=/lib$suffix
install
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index d93cd14..66e1aa3 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -1,10 +1,6 @@
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
+if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
+ ./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (336c59fab4bc5da25a878791531480d4feb517dd), Pavel Vinogradov, 04/30/2015

Archive powered by MHonArc 2.6.24.

Top of Page