Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (e8068125ddcf9919f71d704ea8a7fdef3dabe294)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (e8068125ddcf9919f71d704ea8a7fdef3dabe294)
  • Date: Sun, 17 Feb 2013 13:16:04 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

devel/automake-1.8/HISTORY | 3 +++
devel/automake-1.8/PRE_BUILD | 2 +-
disk/cdrdao/HISTORY | 3 +++
disk/cdrdao/PRE_BUILD | 2 ++
disk/cdrdao/cdrdao-configure.patch | 12 ++++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit e8068125ddcf9919f71d704ea8a7fdef3dabe294
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

cdrdao: added patch for configure.ac so svn will build

commit 146bd00fc3f2a0bebe2ad36728dff40dd52fde2e
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

automake-1.8: added --add-missing to automake command in PRE_BUILD

diff --git a/devel/automake-1.8/HISTORY b/devel/automake-1.8/HISTORY
index 017b176..6cd7900 100644
--- a/devel/automake-1.8/HISTORY
+++ b/devel/automake-1.8/HISTORY
@@ -1,3 +1,6 @@
+2013-02-21 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added --add-missing to automake command
+
2006-11-16 George Sherwood <george AT beernabeer.com>
* PRE_BUILD: removed version from automake/aclocal-1.9 (Bug 13269)

diff --git a/devel/automake-1.8/PRE_BUILD b/devel/automake-1.8/PRE_BUILD
index 2bead40..a17dab3 100755
--- a/devel/automake-1.8/PRE_BUILD
+++ b/devel/automake-1.8/PRE_BUILD
@@ -6,5 +6,5 @@ patch -p0 < $SCRIPT_DIRECTORY/versioning.patch &&
# been removed due to being previously tracked by one of the
# automake-X.X spells
aclocal &&
-automake &&
+automake --add-missing &&
autoconf
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index c38c65d..dcbfc6a 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,6 @@
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added patch for configure.ac
+
2012-06-27 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: added, to apply patch for stable branch
* stat.patch: added, add stat headers to fix compilation
diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index 7a7823c..97d76d3 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -3,4 +3,6 @@ cd $SOURCE_DIRECTORY &&

if [[ "$CDRDAO_BRANCH" == "stable" ]]; then
patch -p1 < $SPELL_DIRECTORY/stat.patch
+else
+ patch -p1 < $SPELL_DIRECTORY/cdrdao-configure.patch
fi
diff --git a/disk/cdrdao/cdrdao-configure.patch
b/disk/cdrdao/cdrdao-configure.patch
new file mode 100644
index 0000000..995e4c5
--- /dev/null
+++ b/disk/cdrdao/cdrdao-configure.patch
@@ -0,0 +1,12 @@
+diff -ur cdrdao-sfcvs/configure.ac cdrdao-mod/configure.ac
+--- cdrdao-sfcvs/configure.ac 2013-02-17 13:08:14.775394278 -0600
++++ cdrdao-mod/configure.ac 2013-02-17 13:09:48.952393222 -0600
+@@ -5,7 +5,7 @@
+
+ AC_CONFIG_SRCDIR(dao/main.cc)
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (e8068125ddcf9919f71d704ea8a7fdef3dabe294), Robin Cook, 02/17/2013

Archive powered by MHonArc 2.6.24.

Top of Page