[SM-Commit] GIT changes to stable-0.3 grimoire by Arwed v. Merkatz

Arwed v. Merkatz scm at mail.sourcemage.org
Sat May 13 16:33:59 EDT 2006


GIT changes to stable-0.3 grimoire by Arwed v. Merkatz <v.merkatz at gmx.net>:

 libs/FUNCTIONS         |   27 ++++++++++++++++++++++++++-
 libs/apr-util0/DETAILS |   10 ++++------
 libs/apr-util0/HISTORY |    6 ++++++
 libs/apr0/BUILD        |   13 +------------
 libs/apr0/DETAILS      |    6 +++---
 libs/apr0/HISTORY      |   10 ++++++++++
 6 files changed, 50 insertions(+), 22 deletions(-)

New commits:
commit 287f05edcb4c5cd2a78f3228b7269c8b8c2f0c50
Author: Jeremy Blosser <jblosser at fawkes.sourcemage.org>
Commit: Arwed v. Merkatz <v.merkatz at gmx.net>

    sync ./libs/FUNCTIONS from stable-rc 0.4
    (cherry picked from edd6b0f4dc4e0c0beefc2d4aa34e3ad9d93af471 commit)

commit ed6a51783166f37a94ebf5dc29c82704e3321b78
Author: Jeremy Blosser <jblosser at fawkes.sourcemage.org>
Commit: Arwed v. Merkatz <v.merkatz at gmx.net>

    sync ./libs/apr-util0 from stable-rc 0.4
    (cherry picked from 9ad0659328ca5b049c5151272043099716aa2a69 commit)

commit f7027ded211a58829a2e1c802d13250c767106d5
Author: Jeremy Blosser <jblosser at fawkes.sourcemage.org>
Commit: Arwed v. Merkatz <v.merkatz at gmx.net>

    sync ./libs/apr0 from stable-rc 0.4
    (cherry picked from 150ea7ee3dcbe04bbe4a7b08da7143027946e8df commit)

diff --git a/libs/FUNCTIONS b/libs/FUNCTIONS
index b370488..28ac9ca 100755
--- a/libs/FUNCTIONS
+++ b/libs/FUNCTIONS
@@ -3,5 +3,30 @@ ## Default configuration for APR spells
 #
 function default_configure_apr ()
 {
-  config_query APR_LATEST 'Would you like to use the latest source code (may not build)?' n
+  config_query APR_LATEST 'Would you like to use the latest source code (may not build)?' n &&
+
+  config_query_option APR_ATOMICS 'Enable non-portable atomics (i486+)?' y \
+    '--enable-nonportable-atomics' \
+    '--disable-nonportable-atomics'
+}
+
+#
+## Build for APR spells
+#
+function build_apr()
+{
+  OPTS="$OPTS $APR_ATOMICS" &&
+
+  ./configure                                   \
+    --host=$HOST                                \
+    --build=$BUILD                              \
+    --prefix=$INSTALL_ROOT/usr                  \
+    --includedir=$INSTALL_ROOT/usr/include/apr  \
+    --sysconfdir=$INSTALL_ROOT/etc              \
+    --localstatedir=$INSTALL_ROOT/var           \
+    --enable-layout=GNU                         \
+    --enable-threads                            \
+    $OPTS                                       &&
+
+  make
 }
diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS
index 11df925..555bbb6 100755
--- a/libs/apr-util0/DETAILS
+++ b/libs/apr-util0/DETAILS
@@ -1,14 +1,12 @@
 source $DEPENDS_CONFIG/apr0.p
 
            SPELL=apr-util0
-# APR_BRANCH replaces APR_VERSION; remove APR_VERSION in May, 2005
-         VERSION=0.9.6
-          MD5[0]=b000af2465752d54c93c6c74cd7775fb 
+         VERSION=0.9.7
+     SOURCE_HASH='sha512:013751ed542b6020cdec8203d4b435a754d7be0ee87d2ce641266332ddb353de8993b958a651a52c5239bdd5fd225118d0cf876948760064a60ce6a2eb033e0b'
        REPOS_URI=branches/0.9.x
-# APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
-if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
+if [[ "$APR_LATEST" == y ]]; then
          VERSION=${VERSION%\.*}-HEAD
-          MD5[0]=IGNORE
+   SOURCE_IGNORE=volatile
     SOURCE_HINTS=old_svn_compat
    SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
 fi
diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY
index 6083c3f..260f3ca 100644
--- a/libs/apr-util0/HISTORY
+++ b/libs/apr-util0/HISTORY
@@ -1,6 +1,12 @@
+2005-11-30 Seth Woolley <seth at tautology.org>
+	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
+
 2005-11-20 Andrew "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: added SOURCE_HINTS=old_svn_compat
 
+2005-10-19 Sergey Lipnevich <sergey at sourcemage.org>
+	* DETAILS: upgrade to 0.9.7.
+
 2005-04-28 Sergey Lipnevich <sergey at sourcemage.org>
 	* PRE_BUILD: remove `&&' at end of file.
 
diff --git a/libs/apr0/BUILD b/libs/apr0/BUILD
index 5a01e06..405e5c9 100755
--- a/libs/apr0/BUILD
+++ b/libs/apr0/BUILD
@@ -1,12 +1 @@
-./configure                                   \
-  --host=$HOST                                \
-  --build=$BUILD                              \
-  --prefix=$INSTALL_ROOT/usr                  \
-  --includedir=$INSTALL_ROOT/usr/include/apr  \
-  --sysconfdir=$INSTALL_ROOT/etc              \
-  --localstatedir=$INSTALL_ROOT/var           \
-  --enable-layout=GNU                         \
-  --enable-threads                            \
-  $OPTS                                       &&
-
-make
+build_apr
diff --git a/libs/apr0/DETAILS b/libs/apr0/DETAILS
index f5ba058..89dc805 100755
--- a/libs/apr0/DETAILS
+++ b/libs/apr0/DETAILS
@@ -1,10 +1,10 @@
            SPELL=apr0
-         VERSION=0.9.6
-          MD5[0]=7e2038ec047ba3efacf24902cdc72433 
+         VERSION=0.9.7
+     SOURCE_HASH='sha512:411eb2b5b4e31b5418db253cd0849612d3b925895e25e23b26a14e344896576c77e9f835496b588015e8dda8ad957099946504207111c54940ecbdf58bafd763'
        REPOS_URI=branches/0.9.x
 if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
          VERSION=${VERSION%\.*}-HEAD
-          MD5[0]=IGNORE
+   SOURCE_IGNORE=volatile
     SOURCE_HINTS=old_svn_compat
    SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
 fi
diff --git a/libs/apr0/HISTORY b/libs/apr0/HISTORY
index 002de87..965ab8c 100644
--- a/libs/apr0/HISTORY
+++ b/libs/apr0/HISTORY
@@ -1,6 +1,16 @@
+2005-11-30 Seth Woolley <seth at tautology.org>
+	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
+
 2005-11-20 Andrew "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: added SOURCE_HINTS=old_svn_compat
 
+2005-10-26 Sergey Lipnevich <sergey at sourcemage.org>
+	* BUILD: non-portable atomics option (see
+	  http://httpd.apache.org/docs/2.1/misc/perf-tuning.html).
+
+2005-10-19 Sergey Lipnevich <sergey at sourcemage.org>
+	* DETAILS: upgrade to 0.9.7.
+
 2005-10-11 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* DETAILS: s/www.apache.org/archive.apache.org/ in the SOURCE_URL so we
 	  can summon the version we're using even when a newer one has been



More information about the SM-Commit mailing list