[Astlinux-commits] SF.net SVN: astlinux: [964] trunk/package

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 964
          http://svn.sourceforge.net/astlinux/?rev=964&view=rev
Author:   krisk84
Date:     2007-04-25 09:15:17 -0700 (Wed, 25 Apr 2007)

Log Message:
-----------
at compile fixes

Modified Paths:
--------------
    trunk/package/asterisk/asterisk.mk
    trunk/package/at/at-crosscompile.patch
    trunk/package/at/at.mk

Added Paths:
-----------
    trunk/package/at/at-sendmailfix.patch

Modified: trunk/package/asterisk/asterisk.mk
===================================================================

--- trunk/package/asterisk/asterisk.mk	2007-04-25 15:57:26 UTC (rev 963)
+++ trunk/package/asterisk/asterisk.mk	2007-04-25 16:15:17 UTC (rev 964)
@@ -66,7 +66,7 @@
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_SPANDSP)),y)
-	toolchain/patch-kernel.sh $(ASTERISK_DIR)/apps package/asterisk/ spandsp.patch
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ spandsp.patch
 	cp package/asterisk/app_?xfax.c $(ASTERISK_DIR)/apps
 	cp $(TARGET_DIR)/usr/lib/libspandsp* $(STAGING_DIR)/usr/lib
 	cp $(TARGET_DIR)/usr/lib/libtiff* $(STAGING_DIR)/usr/lib

Modified: trunk/package/at/at-crosscompile.patch
===================================================================
--- trunk/package/at/at-crosscompile.patch	2007-04-25 15:57:26 UTC (rev 963)
+++ trunk/package/at/at-crosscompile.patch	2007-04-25 16:15:17 UTC (rev 964)
@@ -1,15 +1,38 @@
---- at/config.h.in
-+++ at/config.h.in
-@@ -182,3 +182,6 @@
+diff -rdup at-3.1.10.orig/Makefile.in at-3.1.10/Makefile.in
+--- at-3.1.10.orig/Makefile.in	2007-01-22 14:35:41.000000000 +0100
++++ at-3.1.10/Makefile.in	2007-01-22 14:41:41.000000000 +0100
+@@ -62,6 +62,8 @@ MISC =  COPYING  Makefile.in configure a
+ DIST = $(CSRCS) $(HEADERS) $(MISC) $(OTHERS)
+ LIST = Filelist Filelist.asc
  
++IROOT = $(DESTDIR)
++
+ .PHONY: all install clean dist distclean
+ 
+ all: at atd atrun
+@@ -78,7 +80,7 @@ atd: $(RUNOBJECTS)
+ y.tab.c y.tab.h: parsetime.y
+ 	$(YACC) -d parsetime.y
+ 
+-lex.yy.c: parsetime.l
++lex.yy.c: parsetime.l y.tab.h
+ 	$(LEX) -i parsetime.l
+ 
+ atrun: atrun.in
+diff -rdup at-3.1.10.orig/config.h.in at-3.1.10/config.h.in
+--- at-3.1.10.orig/config.h.in	2007-01-22 14:35:41.000000000 +0100
++++ at-3.1.10/config.h.in	2007-01-22 14:35:35.000000000 +0100
+@@ -181,3 +181,6 @@
+ 
  #undef HAVE_ATTRIBUTE_NORETURN
  #undef HAVE_PAM
 +
 +#undef NEED_YYWRAP
 +
---- at/configure
-+++ at/configure
-@@ -1037,7 +1037,7 @@
+diff -rdup at-3.1.10.orig/configure at-3.1.10/configure
+--- at-3.1.10.orig/configure	2007-01-22 14:35:41.000000000 +0100
++++ at-3.1.10/configure	2007-01-22 14:35:35.000000000 +0100
+@@ -1037,7 +1037,7 @@ esac
  echo $ac_n "checking Trying to compile a trivial ANSI C program""... $ac_c" 1>&6
  echo "configure:1039: checking Trying to compile a trivial ANSI C program" >&5
  if test "$cross_compiling" = yes; then
@@ -18,9 +41,10 @@
  else
    cat > conftest.$ac_ext <<EOF
  #line 1044 "configure"
---- at/getloadavg.c
-+++ at/getloadavg.c
-@@ -66,11 +66,12 @@
+diff -rdup at-3.1.10.orig/getloadavg.c at-3.1.10/getloadavg.c
+--- at-3.1.10.orig/getloadavg.c	2007-01-22 14:35:41.000000000 +0100
++++ at-3.1.10/getloadavg.c	2007-01-22 14:35:35.000000000 +0100
+@@ -66,11 +66,12 @@ Boston, MA  02110-1301  USA */
  
  /* This should always be first.  */
  #ifdef HAVE_CONFIG_H
@@ -36,22 +60,23 @@
  
  #ifndef HAVE_GETLOADAVG
  
---- at/Makefile.in
-+++ at/Makefile.in
-@@ -62,6 +62,8 @@
- DIST = $(CSRCS) $(HEADERS) $(MISC) $(OTHERS)
- LIST = Filelist Filelist.asc
+diff -rdup at-3.1.10.orig/parsetime.h at-3.1.10/parsetime.h
+--- at-3.1.10.orig/parsetime.h	2005-08-05 05:16:01.000000000 +0200
++++ at-3.1.10/parsetime.h	2007-01-22 14:45:41.000000000 +0100
+@@ -17,6 +17,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
  
-+IROOT = $(DESTDIR)
-+
- .PHONY: all install clean dist distclean
++#include "panic.h"
+ time_t parsetime(int argc, char **argv);
  
- all: at atd atrun
---- at/parsetime.l
-+++ at/parsetime.l
+ extern char *last_token;
+diff -rdup at-3.1.10.orig/parsetime.l at-3.1.10/parsetime.l
+--- at-3.1.10.orig/parsetime.l	2007-01-22 14:35:41.000000000 +0100
++++ at-3.1.10/parsetime.l	2007-01-22 14:35:35.000000000 +0100
 @@ -1,5 +1,6 @@
  %{
-
+ 
 +#include "config.h"
  #include <string.h>
  #include <time.h>

Added: trunk/package/at/at-sendmailfix.patch
===================================================================
--- trunk/package/at/at-sendmailfix.patch	                        (rev 0)
+++ trunk/package/at/at-sendmailfix.patch	2007-04-25 16:15:17 UTC (rev 964)
@@ -0,0 +1,12 @@
+diff -ur at-3.1.10.orig/atd.c at-3.1.10/atd.c
+--- at-3.1.10.orig/atd.c	2005-08-30 19:42:56.000000000 -0400
++++ at-3.1.10/atd.c	2007-04-25 12:12:46.000000000 -0400
+@@ -494,8 +494,6 @@
+ 
+ #if defined(SENDMAIL)
+ 	    execl(SENDMAIL, "sendmail", mailname, (char *) NULL);
+-#else
+-#error      "No mail command specified."
+ #endif
+ 	    perr("Exec failed for mail command");
+ 

Modified: trunk/package/at/at.mk
===================================================================
--- trunk/package/at/at.mk	2007-04-25 15:57:26 UTC (rev 963)
+++ trunk/package/at/at.mk	2007-04-25 16:15:17 UTC (rev 964)
@@ -9,24 +9,29 @@
 AT_DIR:=$(BUILD_DIR)/at-$(AT_VER)
 AT_CAT:=zcat
 AT_TARGET_BINARY:=usr/bin/at
+AT_BINARY:=at
 
 $(DL_DIR)/$(AT_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(AT_SITE)/$(AT_SOURCE)
 
+at-source: $(DL_DIR)/$(AT_SOURCE)
+
 $(AT_DIR)/.unpacked: $(DL_DIR)/$(AT_SOURCE)
 	$(AT_CAT) $(DL_DIR)/$(AT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(AT_DIR) package/at/ at\*.patch
-	touch $(AT_DIR)/.unpacked
+	touch $@
 
 $(AT_DIR)/.configured: $(AT_DIR)/.unpacked
 	(cd $(AT_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
+		--libdir=/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
@@ -35,19 +40,20 @@
 		--with-daemon_username=at \
 		--with-daemon_groupname=at \
 	);
-	touch $(AT_DIR)/.configured
+	touch $@
 
 $(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(AT_DIR)
+	touch -c $(AT_DIR)/$(AT_BINARY)
 
 $(TARGET_DIR)/$(AT_TARGET_BINARY): $(AT_DIR)/$(AT_BINARY)
 	# Use fakeroot to pretend to do 'make install' as root
-	rm -f $(STAGING_DIR)/.fakeroot.at
-	$(STAGING_DIR)/usr/bin/fakeroot -s $(STAGING_DIR)/.fakeroot.at -- \
-		$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root \
-		$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install
+	echo "$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root " \
+		"$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install" \
+		> $(STAGING_DIR)/.fakeroot.at
+	echo "rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at" >> $(STAGING_DIR)/.fakeroot.at
 	$(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/etc/init.d/S99at
-	rm -rf $(TARGET_DIR)/usr/man
+	touch -c $(TARGET_DIR)/$(AT_TARGET_BINARY)
 
 at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_BINARY)
 
@@ -57,7 +63,6 @@
 
 at-dirclean:
 	rm -rf $(AT_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options


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


