[asterisk-commits] mnicholson: testsuite/asterisk/trunk r420 - in /asterisk/trunk/asttest: ./ to...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jun 22 15:09:08 CDT 2010


Author: mnicholson
Date: Tue Jun 22 15:09:04 2010
New Revision: 420

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=420
Log:
Attempt to make asttest build on centos and without pkg-config present

Modified:
    asterisk/trunk/asttest/Makefile
    asterisk/trunk/asttest/tools/lfs.diff
    asterisk/trunk/asttest/tools/luaposix.diff
    asterisk/trunk/asttest/tools/luasocket.diff

Modified: asterisk/trunk/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/Makefile?view=diff&rev=420&r1=419&r2=420
==============================================================================
--- asterisk/trunk/asttest/Makefile (original)
+++ asterisk/trunk/asttest/Makefile Tue Jun 22 15:09:04 2010
@@ -44,11 +44,11 @@
 
 # Basic set of sources and flags/libraries/includes
 OBJS:=asttest.o lib/lua.o lib/testsuite.o lib/testutils.o
-CFLAGS:=-g -c -D_GNU_SOURCE -Wall -I/usr/include/lua5.1 -Iinclude -Ilua
+CFLAGS:=-g -c -D_GNU_SOURCE -Wall `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null` -Iinclude
 L_MODULES:=$(LUAFILESYSTEM_OBJS) $(LUASOCKET_OBJS) $(LUAPOSIX_OBJS) 
 L_LIBS:=$(LUAPOSIX_LIBS)
 L_OBJS:=lib/lua/testlib.o lib/lua/astlib.o lib/lua/proclib.o
-T_LIBS:=-llua5.1 -lm -ldl
+T_LIBS:=`pkg-config --libs lua5.1 2> /dev/null || pkg-config --libs lua 2> /dev/null || echo -llua -lm -ldl`
 
 
 all: asttest

Modified: asterisk/trunk/asttest/tools/lfs.diff
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/tools/lfs.diff?view=diff&rev=420&r1=419&r2=420
==============================================================================
--- asterisk/trunk/asttest/tools/lfs.diff (original)
+++ asterisk/trunk/asttest/tools/lfs.diff Tue Jun 22 15:09:04 2010
@@ -1,19 +1,47 @@
-diff -ru a/config b/config
+diff -ruN a/config b/config
 --- a/config	2007-10-27 17:42:32.000000000 -0500
-+++ b/config	2010-03-25 10:35:55.000000000 -0500
++++ b/config	2010-06-22 15:07:45.000000000 -0500
 @@ -18,7 +18,8 @@
  # Compilation directives
  WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
  INCS= -I$(LUA_INC)
 -CFLAGS= $(WARN) $(INCS)
-+LUA_CFLAGS=`pkg-config --cflags lua5.1`
++LUA_CFLAGS=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`
 +CFLAGS= $(WARN) $(LUA_CFLAGS)
  CC= gcc
  
  # $Id$
-diff -ru a/src/lfs.c b/src/lfs.c
+diff -ruN a/config.orig b/config.orig
+--- a/config.orig	1969-12-31 18:00:00.000000000 -0600
++++ b/config.orig	2007-10-27 17:42:32.000000000 -0500
+@@ -0,0 +1,24 @@
++# Installation directories
++
++# Default installation prefix
++PREFIX=/usr/local
++
++# System's libraries directory (where binary libraries are installed)
++LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
++
++# Lua includes directory
++LUA_INC= $(PREFIX)/include
++
++# OS dependent
++LIB_OPTION= -shared #for Linux
++#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
++
++LIBNAME= $T.so.$V
++
++# Compilation directives
++WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
++INCS= -I$(LUA_INC)
++CFLAGS= $(WARN) $(INCS)
++CC= gcc
++
++# $Id$
+diff -ruN a/src/lfs.c b/src/lfs.c
 --- a/src/lfs.c	2009-02-03 16:05:48.000000000 -0600
-+++ b/src/lfs.c	2010-04-23 09:37:58.000000000 -0500
++++ b/src/lfs.c	2010-06-10 15:29:04.000000000 -0500
 @@ -232,7 +232,8 @@
    }
  }

Modified: asterisk/trunk/asttest/tools/luaposix.diff
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/tools/luaposix.diff?view=diff&rev=420&r1=419&r2=420
==============================================================================
--- asterisk/trunk/asttest/tools/luaposix.diff (original)
+++ asterisk/trunk/asttest/tools/luaposix.diff Tue Jun 22 15:09:04 2010
@@ -1,6 +1,6 @@
 diff -ruN a/lposix.c b/lposix.c
 --- a/lposix.c	2008-07-18 09:30:36.000000000 -0500
-+++ b/lposix.c	2010-06-10 15:25:59.000000000 -0500
++++ b/lposix.c	2010-06-22 15:05:04.000000000 -0500
 @@ -575,6 +575,13 @@
  	return 1;
  }
@@ -25,7 +25,7 @@
  	{"times",		Ptimes},
 diff -ruN a/lposix.h b/lposix.h
 --- a/lposix.h	1969-12-31 18:00:00.000000000 -0600
-+++ b/lposix.h	2010-04-23 09:44:46.000000000 -0500
++++ b/lposix.h	2010-06-22 15:05:04.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef LPOSIX_H
 +#define LPOSIX_H
@@ -35,13 +35,13 @@
 +#endif
 diff -ruN a/Makefile b/Makefile
 --- a/Makefile	2008-07-18 09:31:56.000000000 -0500
-+++ b/Makefile	2010-04-23 09:44:46.000000000 -0500
++++ b/Makefile	2010-06-22 15:05:04.000000000 -0500
 @@ -25,7 +25,7 @@
  
  CPPFLAGS=	-fPIC $(INCS) $(WARN)
  WARN=		-pedantic -Wall
 -INCS=		-I$(LUAINC)
-+INCS=		`pkg-config --cflags lua5.1`
++INCS=		`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`
  
  MYNAME=		posix
  MYLIB= 		$(MYNAME)

Modified: asterisk/trunk/asttest/tools/luasocket.diff
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/tools/luasocket.diff?view=diff&rev=420&r1=419&r2=420
==============================================================================
--- asterisk/trunk/asttest/tools/luasocket.diff (original)
+++ asterisk/trunk/asttest/tools/luasocket.diff Tue Jun 22 15:09:04 2010
@@ -1,6 +1,6 @@
-diff -ru a/config b/config
+diff -ruN a/config b/config
 --- a/config	2007-10-14 23:21:05.000000000 -0500
-+++ b/config	2009-05-08 11:43:37.000000000 -0500
++++ b/config	2010-06-22 15:02:13.000000000 -0500
 @@ -11,13 +11,12 @@
  SOCKET_SO=socket.$(EXT).$(SOCKET_V) 
  MIME_SO=mime.$(EXT).$(MIME_V)
@@ -13,7 +13,7 @@
 -#LUAINC=-I/usr/local/include/lua50
 -#LUAINC=-I/usr/local/include/lua5.1
 -#LUAINC=-Ilua-5.1.1/src
-+LUAINC=`pkg-config --cflags lua5.1`
++LUAINC=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`
  
  #------
  # Compat-5.1 directory
@@ -28,9 +28,9 @@
  
  #------
  # End of makefile configuration
-diff -ru a/src/makefile b/src/makefile
+diff -ruN a/src/makefile b/src/makefile
 --- a/src/makefile	2007-10-14 23:21:05.000000000 -0500
-+++ b/src/makefile	2009-05-08 11:41:32.000000000 -0500
++++ b/src/makefile	2010-06-10 15:29:05.000000000 -0500
 @@ -47,7 +47,7 @@
  	usocket.o \
  	unix.o
@@ -61,4 +61,3 @@
  	rm -f $(MIME_SO) $(UNIX_SO) $(MIME_OBJS) $(UNIX_OBJS)
  
  #------
-Only in b: tags




More information about the asterisk-commits mailing list