[SM-Commit] GIT changes to master grimoire by Jeremy Blosser (5999f3b6fefce807ae0ecb2c2d0f5a077435b81e)
Jeremy Blosser
scm at mail.sourcemage.org
Sat Mar 17 16:31:52 EDT 2007
GIT changes to master grimoire by Jeremy Blosser <jblosser-smgl at firinn.org>:
disk/evms/BUILD | 1
disk/evms/CONFIGURE | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
disk/evms/DEPENDS | 18 ++++++------
disk/evms/HISTORY | 8 ++++-
4 files changed, 94 insertions(+), 9 deletions(-)
New commits:
commit 5999f3b6fefce807ae0ecb2c2d0f5a077435b81e
Author: Jeremy Blosser <jblosser-smgl at firinn.org>
Commit: Jeremy Blosser <jblosser-smgl at firinn.org>
evms: Apply spell features patch from Mark Bainter, bug #13606.
diff --git a/disk/evms/BUILD b/disk/evms/BUILD
index 6126663..073748c 100755
--- a/disk/evms/BUILD
+++ b/disk/evms/BUILD
@@ -1,5 +1,6 @@
OPTS="--libdir=/lib
--sbindir=/sbin
+ ${EVMS_OPTS}
${OPTS}
" &&
diff --git a/disk/evms/CONFIGURE b/disk/evms/CONFIGURE
new file mode 100755
index 0000000..f1cbbf1
--- /dev/null
+++ b/disk/evms/CONFIGURE
@@ -0,0 +1,76 @@
+if spell_ok "gtk+"; then
+ EVMS_BUILD_GTK_DEFAULT="y"
+else
+ EVMS_BUILD_GTK_DEFAULT="n"
+fi &&
+
+config_query_option EVMS_OPTS "Enable GTK+ Interface?" \
+ "${EVMS_BUILD_GTK_DEFAULT}" \
+ "--enable-gui" \
+ "--disable-gui" &&
+
+if spell_ok "ncurses"; then
+ EVMS_BUILD_TXTMODE_DEFAULT="y"
+else
+ EVMS_BUILD_TXTMODE_DEFAULT="n"
+fi &&
+
+config_query_option EVMS_OPTS "Enable Text-Mode curses Interface?" \
+ "${EVMS_BUILD_TXTMODE_DEFAULT}" \
+ "--enable-text-mode" \
+ "--disable-text-mode" &&
+
+if list_find "${EVMS_OPTS}" "--enable-gui" ||
+ list_find "${EVMS_OPTS}" "--enable-text-mode"; then
+
+ message "The Text Mode and GTK+ interfaces depend on glib..." &&
+ message "WARNING: If your root or usr partitions are managed by EVMS" &&
+ message "and you do not build against the static glib your system" &&
+ message "may not boot." &&
+
+ config_query_option EVMS_OPTS "Build against static glib?" \
+ "n" \
+ "--with-static-glib" \
+ ""
+fi &&
+
+config_query_option EVMS_OPTS "Enable Command Line Interface?" \
+ "y" \
+ "--enable-cli" \
+ "--disable-cli" &&
+
+config_query_option EVMS_OPTS "Enable the GPT segment manager?" \
+ "y" \
+ "--enable-gpt" \
+ "--disable-gpt" &&
+
+config_query_option EVMS_OPTS "Enable the S/390 segment manager?" \
+ "y" \
+ "--enable-s390" \
+ "--disable-s390" &&
+
+config_query_option EVMS_OPTS "Enable the BSD segment manager?" \
+ "y" \
+ "--enable-bsd" \
+ "--disable-bsd" &&
+
+config_query_option EVMS_OPTS "Enable the Macintosh segment manager?" \
+ "y" \
+ "--enable-mac" \
+ "--disable-mac" &&
+
+config_query_option EVMS_OPTS "Enable the LVM plugin?" \
+ "y" \
+ "--enable-lvm" \
+ "--disable-lvm" &&
+
+config_query_option EVMS_OPTS "Enable the LVM2 plugin?" \
+ "y" \
+ "--enable-lvm2" \
+ "--disable-lvm2" &&
+
+config_query_option EVMS_OPTS "Enable the Software Raid plugin?" \
+ "y" \
+ "--enable-md" \
+ "--disable-md"
+
diff --git a/disk/evms/DEPENDS b/disk/evms/DEPENDS
index 8836a97..06a890d 100755
--- a/disk/evms/DEPENDS
+++ b/disk/evms/DEPENDS
@@ -1,11 +1,13 @@
depends device-mapper &&
-optional_depends glib \
- "--with-static-glib" \
- "--disable-text-mode" \
- "for GTK GUI and text-mode support" &&
+if list_find "${EVMS_OPTS}" "--enable-gui" || list_find "${EVMS_OPTS}" "--enable-text-mode"; then
+ depends glib
+fi &&
-optional_depends gtk+ \
- "" \
- "--disable-gui" \
- "for GTK GUI support"
+if list_find "${EVMS_OPTS}" "--enable-text-mode"; then
+ depends ncurses
+fi &&
+
+if list_find "${EVMS_OPTS}" "--enable-gui"; then
+ depends gtk+
+fi
diff --git a/disk/evms/HISTORY b/disk/evms/HISTORY
index 815f198..7671a1a 100644
--- a/disk/evms/HISTORY
+++ b/disk/evms/HISTORY
@@ -1,3 +1,9 @@
+2007-03-08 Mark Bainter <mbainter-smgl at lostinagoodbook.org>
+ * BUILD: Added EVMS_OPTS variable for CONFIGURE changes
+ * CONFIGURE: Added prompts for build options
+ * DEPENDS: Added optional dependency for ncurses, corrected glib
+ dependency, made static glib optional
+
2007-02-26 Jeremy Blosser <jblosser-smgl at firinn.org>
* BUILD, PRE_BUILD: Move patching to PRE_BUILD.
* DEPENDS: Add --disable-text-mode when glib isn't used.
@@ -10,7 +16,7 @@
* DETAILS: (automated) Add KEYWORDS
2006-02-28 Flavien Bridault <disk at sourcemage.org>
- * DETAILS: updated to 2.5.5
+ * DETAILS: updated to 2.5.5
2006-01-23 Ladislav Hagara <hgr at vabo.cz>
* DETAILS: 2.5.4
More information about the SM-Commit
mailing list