[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (7531f0e418b355f9df6b5b3047323d8b7d3d01d5)

Juuso Alasuutari scm at mail.sourcemage.org
Sat Sep 16 05:56:41 EDT 2006


GIT changes to master grimoire by Juuso Alasuutari <iuso at sourcemage.org>:

 audio-soft/lash/BUILD             |    4 +++
 audio-soft/lash/DETAILS           |    1 
 audio-soft/lash/HISTORY           |    7 ++++-
 audio-soft/lash/PRE_BUILD         |    6 ++++
 audio-soft/lash/malloc_64bit.diff |   46 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 1b9bed3cefe8fa4f1705468d4aba3fa17decd650
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    lash: Disable -Os to fix segfaults, apply fix patch for 64-bit archs.

diff --git a/audio-soft/lash/BUILD b/audio-soft/lash/BUILD
new file mode 100755
index 0000000..9ce28d9
--- /dev/null
+++ b/audio-soft/lash/BUILD
@@ -0,0 +1,4 @@
+# -Os causes lashd to segfault
+CFLAGS="${CFLAGS//-Os}"  &&
+
+default_build
diff --git a/audio-soft/lash/DETAILS b/audio-soft/lash/DETAILS
index 86c1354..9eb4b38 100755
--- a/audio-soft/lash/DETAILS
+++ b/audio-soft/lash/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://www.nongnu.org/lash/
      SOURCE_HASH=sha512:c91360887d1046fbaf90e523d85ab06b4feaa6273c8d9a1a1a4ce9216598f833e1ef60f8c18099480923d506832e39eeabafa90573e700fcb5d7180e5091454c
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         KEYWORDS="alsa jack tools audio"
            SHORT="Session management system for JACK and ALSA."
 cat << EOF
diff --git a/audio-soft/lash/HISTORY b/audio-soft/lash/HISTORY
index e391131..c152fe3 100644
--- a/audio-soft/lash/HISTORY
+++ b/audio-soft/lash/HISTORY
@@ -1,3 +1,9 @@
+2006-09-16 Juuso Alasuutari <iuso at sourcemage.org>
+	* BUILD: Added. Disable -Os, causes lashd to segfault.
+	* PRE_BUILD: Added. Apply patch from Debian for 64-bit archs.
+	* malloc_64bit.diff: Added.
+	* DETAILS: PATCHLEVEL=1
+
 2006-08-05 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Aligned lines correctly, shortened short description.
 	* DEPENDS: Removed depends glib & readline (not required & in 
@@ -7,4 +13,3 @@
 
 2006-07-24 Unet <unet at sourcemage.org>
 	* ALL: created spell
-
diff --git a/audio-soft/lash/PRE_BUILD b/audio-soft/lash/PRE_BUILD
new file mode 100755
index 0000000..c3b1853
--- /dev/null
+++ b/audio-soft/lash/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build      &&
+cd  $SOURCE_DIRECTORY  &&
+
+# Apply fix from Debian unstable for malloc on 64-bit archs, Debian bug 
+# 375758.
+patch -p1 < $SCRIPT_DIRECTORY/malloc_64bit.diff
diff --git a/audio-soft/lash/malloc_64bit.diff b/audio-soft/lash/malloc_64bit.diff
new file mode 100644
index 0000000..4968260
--- /dev/null
+++ b/audio-soft/lash/malloc_64bit.diff
@@ -0,0 +1,46 @@
+--- a/liblash/client.c	2005-09-15 11:15:30.000000000 +0300
++++ b/liblash/client.c	2006-09-16 10:52:11.000000000 +0300
+@@ -20,7 +20,7 @@
+ 
+ #include <lash/types.h>
+ #include <lash/client.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/internal.h>
+ 
+ lash_client_t *
+--- a/liblash/config.c	2005-09-15 11:15:30.000000000 +0300
++++ b/liblash/config.c	2006-09-16 10:52:11.000000000 +0300
+@@ -22,7 +22,7 @@
+ #include <stdio.h>
+ 
+ #include <lash/config.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/internal.h>
+ 
+ void
+--- a/liblash/event.c	2005-09-15 11:15:30.000000000 +0300
++++ b/liblash/event.c	2006-09-16 10:52:11.000000000 +0300
+@@ -22,7 +22,7 @@
+ 
+ #include <lash/types.h>
+ #include <lash/internal.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/event.h>
+ 
+ lash_event_t *
+--- a/liblash/socket.c	2005-10-04 06:26:41.000000000 +0300
++++ b/liblash/socket.c	2006-09-16 10:52:11.000000000 +0300
+@@ -34,6 +34,10 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ 
++
++#include <lash/list.h> /* Something weird with mutual includes between list.h and xmalloc.h, which leaves
++                          lash_malloc undefined. I am including list. h before xmalloc.h, which will pull in
++                          xmalloc.h. In fact xmalloc.h include can be removed */
+ #include <lash/xmalloc.h>
+ #include <lash/debug.h>
+ 



More information about the SM-Commit mailing list