Skip to Content.
Sympa Menu

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

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 (ecfe9a5e83b41efb9532e94cd15aa2b8f7525ecd)
  • Date: Mon, 9 Sep 2013 16:25:29 -0500

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

disk/cdrdao/BUILD | 20 --------------------
disk/cdrdao/HISTORY | 5 +++++
disk/cdrdao/PRE_BUILD | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+), 20 deletions(-)

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

cdrdao: fixed to build with new automake

diff --git a/disk/cdrdao/BUILD b/disk/cdrdao/BUILD
deleted file mode 100755
index be57128..0000000
--- a/disk/cdrdao/BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-if [[ "$CDRDAO_BRANCH" != "scm" ]]; then
- ##### Patch needed for building on x86_64 ######
- ARCH=$(uname -m) &&
- if [ "${ARCH:0:6}" = "x86_64" ]; then
- cd scsilib/RULES
&&
- cp i686-linux-cc.rul x86_64-linux-cc.rul
&&
- cd $SOURCE_DIRECTORY
- fi
- ################################################
-else
- sedit "/^AM_GCONF_SOURCE_2$/d" configure.ac &&
- touch xdao/gcdmaster.schemas.in &&
- ./autogen.sh
-fi &&
-
-sed -i 's:/usr/src/linux/include::' scsilib/DEFAULTS/Defaults.linux &&
-sed -i 's/xdao=xdao/xdao=no/' configure &&
-sed -i 's:#include <linux/sysctl.h>::' dao/dao.cc &&
-
-default_build
diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index dcbfc6a..0295cd1 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,8 @@
+2013-09-09 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: moved all in build here.
+ added aclocal and automake --add-missing to build with new automake
+ * BUILD: no longer needed
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added patch for configure.ac

diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
index 97d76d3..73f252b 100755
--- a/disk/cdrdao/PRE_BUILD
+++ b/disk/cdrdao/PRE_BUILD
@@ -5,4 +5,26 @@ if [[ "$CDRDAO_BRANCH" == "stable" ]]; then
patch -p1 < $SPELL_DIRECTORY/stat.patch
else
patch -p1 < $SPELL_DIRECTORY/cdrdao-configure.patch
+# patch -p1 < $SPELL_DIRECTORY/cdrdao-automake-fix.patch
fi
+
+if [[ "$CDRDAO_BRANCH" != "scm" ]]; then
+ ##### Patch needed for building on x86_64 ######
+ ARCH=$(uname -m) &&
+ if [ "${ARCH:0:6}" = "x86_64" ]; then
+ cd scsilib/RULES &&
+ cp i686-linux-cc.rul x86_64-linux-cc.rul &&
+ cd $SOURCE_DIRECTORY
+ fi
+ ################################################
+else
+ sedit "/^AM_GCONF_SOURCE_2$/d" configure.ac &&
+ touch xdao/gcdmaster.schemas.in &&
+ aclocal
+ automake --add-missing
+ ./autogen.sh
+fi &&
+
+sed -i 's:/usr/src/linux/include::' scsilib/DEFAULTS/Defaults.linux &&
+sed -i 's/xdao=xdao/xdao=no/' configure &&
+sed -i 's:#include <linux/sysctl.h>::' dao/dao.cc



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (ecfe9a5e83b41efb9532e94cd15aa2b8f7525ecd), Robin Cook, 09/09/2013

Archive powered by MHonArc 2.6.24.

Top of Page