[csw-devel] SF.net SVN: gar:[9011] csw/mgar/pkg/awesome/trunk

[wahwah at users.sourceforge.net]

Revision: 9011
          http://gar.svn.sourceforge.net/gar/?rev=9011&view=rev
Author:   wahwah
Date:     2010-03-07 10:51:35 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
awesome: compiles, but fails to link.

Modified Paths:
--------------
    csw/mgar/pkg/awesome/trunk/Makefile
    csw/mgar/pkg/awesome/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch
    csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch

Modified: csw/mgar/pkg/awesome/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awesome/trunk/Makefile	2010-03-07 10:34:05 UTC (rev 9010)
+++ csw/mgar/pkg/awesome/trunk/Makefile	2010-03-07 10:51:35 UTC (rev 9011)
@@ -17,16 +17,21 @@
 INSTALL_SCRIPTS = awesome
 CONFIGURE_ARGS = $(DIRPATHS)
 GARCOMPILER = GNU
+EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv
 
+BUILD_DEP_PKGS += CSWlua CSWgperf
 EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
+PATCHFILES += gperf.sh-solarify.patch
+PATCHFILES += backtrace.c.patch
 
 include gar/category.mk
 
 build-awesome:
-	(cd $(WORKSRC); gmake $(BUILD_ENV))
+	(cd $(WORKSRC); gmake $(BUILD_ENV) VERBOSE=1)
 	@$(MAKECOOKIE)
 
 install-awesome:
 	(cd $(WORKSRC); gmake  $(INSTALL_ENV) install)
 	@$(MAKECOOKIE)
 
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/awesome/trunk/checksums
===================================================================
--- csw/mgar/pkg/awesome/trunk/checksums	2010-03-07 10:34:05 UTC (rev 9010)
+++ csw/mgar/pkg/awesome/trunk/checksums	2010-03-07 10:51:35 UTC (rev 9011)
@@ -1 +1,3 @@
 8c2537ad898d7f58a0f3ba92e6a561a1  awesome-3.4.4.tar.bz2
+1d5c67eb4555b367032c1294fb72bf0b  backtrace.c.patch
+346c2299f6f5be4d667ff3769a1251f0  gperf.sh-solarify.patch

Added: csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch	                        (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/backtrace.c.patch	2010-03-07 10:51:35 UTC (rev 9011)
@@ -0,0 +1,30 @@
+--- awesome-3.4.4/common/backtrace.c.orig	2010-03-07 10:55:50.898528590 +0100
++++ awesome-3.4.4/common/backtrace.c	2010-03-07 10:57:36.194936144 +0100
+@@ -19,7 +19,6 @@
+  *
+  */
+ 
+-#include <execinfo.h>
+ #include "common/backtrace.h"
+ 
+ #define MAX_STACK_SIZE 32
+@@ -34,8 +33,8 @@
+     char **bt;
+     int stack_size;
+ 
+-    stack_size = backtrace(stack, countof(stack));
+-    bt = backtrace_symbols(stack, stack_size);
++    stack_size = 0;
++    bt = NULL;
+ 
+     buffer_init(buf);
+     if(bt)
+@@ -49,7 +48,7 @@
+         p_delete(&bt);
+     }
+     else
+-        buffer_addsl(buf, "Cannot get backtrace symbols.");
++        buffer_addsl(buf, "Cannot get backtrace symbols, disabled due to missing execinfo.h on Solaris.");
+ }
+ 
+ // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

Added: csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch	                        (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/gperf.sh-solarify.patch	2010-03-07 10:51:35 UTC (rev 9011)
@@ -0,0 +1,43 @@
+--- awesome-3.4.4/build-utils/gperf.sh.orig	2010-03-07 10:35:38.518346274 +0100
++++ awesome-3.4.4/build-utils/gperf.sh	2010-03-07 10:37:23.977357986 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # Copyright © 2008 Pierre Habouzit <madcoder at debian.org>
+ #
+@@ -50,7 +50,7 @@
+ 
+ typedef enum awesome_token_t {
+     A_TK_UNKNOWN,
+-`tr '[:lower:]' '[:upper:]' | sed -e "s/^[^/].*/    A_TK_&,/"`
++`tr '[:lower:]' '[:upper:]' | gsed -e "s/^[^/].*/    A_TK_&,/"`
+ } awesome_token_t;
+ 
+ __attribute__((pure)) enum awesome_token_t a_tokenize(const char *s, int len);
+@@ -109,14 +109,14 @@
+ }
+ 
+ extract_tokens() {
+-    grep '^### ' "$1" | cut -d ' ' -f 2
++    ggrep '^### ' "$1" | cut -d ' ' -f 2
+ }
+ 
+ 
+ TOKENS_FILE="$1"
+ TARGET="$2"
+ 
+-trap "rm -f ${TARGET}" 0
++trap "grm -f ${TARGET}" 0
+ 
+ rm -f "${TARGET}"
+ case "${TARGET}" in
+@@ -124,7 +124,7 @@
+     *.c) do_c > "${TARGET}" < "${TOKENS_FILE}" ;;
+     *)  die "you must ask for the 'h' or 'c' generation";;
+ esac
+-chmod -w "${TARGET}"
++gchmod -w "${TARGET}"
+ 
+ trap - 0
+ exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.