Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (34e32e995fb0b93b3a242e36e52f9b091e81b8ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (34e32e995fb0b93b3a242e36e52f9b091e81b8ba)
  • Date: Fri, 26 Jan 2007 11:18:19 -0600

GIT changes to master grimoire by David Kowis <dkowis@melchiah.(none)>:

devel/git/BUILD | 10 ++++++++--
devel/git/DEPENDS | 15 ++++++++++++---
devel/git/HISTORY | 5 +++--
3 files changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 34e32e995fb0b93b3a242e36e52f9b091e81b8ba
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@melchiah.(none)>

git

Modified the build process to make it use the ./configure
so that curl and expat can remain optional
now it uses autoconf tho.

diff --git a/devel/git/BUILD b/devel/git/BUILD
index e4512da..b89b916 100755
--- a/devel/git/BUILD
+++ b/devel/git/BUILD
@@ -1,3 +1,9 @@
-GIT_MAKE_OPTS="$GIT_MAKE_OPTS $OPTS" &&
+#GIT_MAKE_OPTS="$GIT_MAKE_OPTS $OPTS" &&
+#
+#make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS

-make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS
+make configure &&
+
+./configure --prefix="${INSTALL_ROOT}/usr" $OPTS &&
+
+make all
diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 432dac3..5b077dd 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -1,12 +1,21 @@
-depends curl &&
-depends expat &&
+depends autoconf &&
if [[ $GIT_SHA_OPT == openssl ]] ; then
depends openssl
fi &&

+optional_depends curl \
+ '--with-curl' \
+ '--without-curl' \
+ 'For http pull' &&
+
+optional_depends expat \
+ '--with-expat' \
+ '--without-expat' \
+ 'for http push' &&
+
optional_depends python \
'' \
- 'NO_PYTHON=true' \
+ '--without-python' \
'For the recursive merge strategy' &&

# these should become suggest_depends when possible
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 25d5928..ab5278b 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,6 +1,7 @@
2007-01-26 David Kowis <dkowis AT shlrm.org>
- * DEPENDS: made curl and expat not optional
- bugs 12975 and 12976
+ * BUILD: changed the build process to use the ./configure method
+ * DEPENDS: modified how curl, expat, and python are optionally
configured
+ Added autoconf to generate the ./configure file
* DETAILS, PREPARE, INSTALL: Modified to be able to install both sets
of documentations. Tweaked the manpage installing to catch man*.
Modified
the html install to include everything in the howto dir.




Archive powered by MHonArc 2.6.24.

Top of Page