OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2006 22:56:16
Branch: HEAD Handle: 2006090521561500
Modified files:
openpkg-src/asterisk asterisk.patch
Log:
fix building under FreeBSD/amd64 (where -fPIC is a strict requirement
for DSOs)
Summary:
Revision Changes Path
1.6 +23 -22 openpkg-src/asterisk/asterisk.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 5 Sep 2006 20:52:40 -0000
1.5
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2006 20:56:15 -0000
1.6
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-06-29 21:23:18 +0200
-+++ Makefile 2006-09-05 22:48:02 +0200
++++ Makefile 2006-09-05 22:54:11 +0200
@@ -110,35 +110,19 @@
# Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
@@ -112,7 +112,7 @@
endif
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
-+++ agi/Makefile 2006-09-05 22:48:02 +0200
++++ agi/Makefile 2006-09-05 22:54:11 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@@ -126,7 +126,7 @@
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/Makefile 2006-09-05 22:48:02 +0200
++++ app_conference/Makefile 2006-09-05 22:54:40 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@@ -140,7 +140,7 @@
# 0 = OFF 1 = astdsp 2 = speex
SILDET := 2
-@@ -44,8 +44,8 @@
+@@ -44,22 +44,23 @@
CC = gcc
INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
@@ -150,8 +150,9 @@
+DEBUG :=
CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
$(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
++CFLAGS += -fPIC
#CFLAGS += -O2
-@@ -53,13 +53,13 @@
+ #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
# PERF: below is 10% faster than -O2 or -O3 alone.
#CFLAGS += -O3 -ffast-math -funroll-loops
# below is another 5% faster or so.
@@ -167,7 +168,7 @@
# adding -msse -mfpmath=sse has little effect.
-@@ -102,14 +102,13 @@
+@@ -102,14 +103,13 @@
rm -f *.so *.o $(OBJS)
app_conference.so : $(OBJS)
@@ -185,7 +186,7 @@
# cp conf.conf /etc/asterisk/
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
-+++ app_conference/conference.c 2006-09-05 22:48:02 +0200
++++ app_conference/conference.c 2006-09-05 22:54:11 +0200
@@ -618,7 +618,7 @@
// acquire conference mutexes
ast_mutex_lock( &conf->lock ) ;
@@ -197,7 +198,7 @@
pthread_detach( conf->conference_thread ) ;
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
-+++ apps/Makefile 2006-09-05 22:48:02 +0200
++++ apps/Makefile 2006-09-05 22:54:11 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@@ -221,7 +222,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: asterisk-addons-1.2.4/Makefile
--- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100
-+++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:48:02 +0200
++++ asterisk-addons-1.2.4/Makefile 2006-09-05 22:54:11 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@@ -245,7 +246,7 @@
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
-+++ cdr/Makefile 2006-09-05 22:48:02 +0200
++++ cdr/Makefile 2006-09-05 22:54:11 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@@ -261,7 +262,7 @@
#This works for even old (2.96) versions of gcc and provides a small boost
either way.
Index: channels/Makefile
--- channels/Makefile.orig 2006-08-17 23:57:19 +0200
-+++ channels/Makefile 2006-09-05 22:48:02 +0200
++++ channels/Makefile 2006-09-05 22:54:11 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@@ -275,7 +276,7 @@
PTLIB=-lpt_OpenBSD_x86_r
Index: channels/chan_h323.c
--- channels/chan_h323.c.orig 2006-08-05 07:08:50 +0200
-+++ channels/chan_h323.c 2006-09-05 22:48:02 +0200
++++ channels/chan_h323.c 2006-09-05 22:54:11 +0200
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@@ -286,7 +287,7 @@
#include <sys/param.h>
Index: channels/chan_skinny.c
--- channels/chan_skinny.c.orig 2006-08-05 07:08:50 +0200
-+++ channels/chan_skinny.c 2006-09-05 22:48:02 +0200
++++ channels/chan_skinny.c 2006-09-05 22:54:11 +0200
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@@ -298,7 +299,7 @@
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ codecs/Makefile 2006-09-05 22:48:02 +0200
++++ codecs/Makefile 2006-09-05 22:54:11 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@@ -351,7 +352,7 @@
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ formats/Makefile 2006-09-05 22:48:02 +0200
++++ formats/Makefile 2006-09-05 22:54:11 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@@ -365,7 +366,7 @@
Index: frame.c
--- frame.c.orig 2006-07-31 06:06:16 +0200
-+++ frame.c 2006-09-05 22:48:02 +0200
++++ frame.c 2006-09-05 22:54:11 +0200
@@ -1055,7 +1055,7 @@
{
switch(buf & TYPE_MASK) {
@@ -377,7 +378,7 @@
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ funcs/Makefile 2006-09-05 22:48:02 +0200
++++ funcs/Makefile 2006-09-05 22:54:11 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@@ -391,7 +392,7 @@
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ pbx/Makefile 2006-09-05 22:48:02 +0200
++++ pbx/Makefile 2006-09-05 22:54:11 +0200
@@ -14,9 +14,7 @@
PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so
pbx_realtime.so \
pbx_ael.so
@@ -405,7 +406,7 @@
#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null
2>/dev/null && echo "pbx_gtkconsole.so")
Index: res/Makefile
--- res/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ res/Makefile 2006-09-05 22:48:02 +0200
++++ res/Makefile 2006-09-05 22:54:11 +0200
@@ -36,10 +36,8 @@
endif
endif
@@ -421,7 +422,7 @@
CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
Index: rtp.c
--- rtp.c.orig 2006-07-13 20:44:17 +0200
-+++ rtp.c 2006-09-05 22:48:02 +0200
++++ rtp.c 2006-09-05 22:54:11 +0200
@@ -962,8 +962,10 @@
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;
@@ -436,7 +437,7 @@
(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
Index: utils.c
--- utils.c.orig 2006-07-12 15:54:10 +0200
-+++ utils.c 2006-09-05 22:48:02 +0200
++++ utils.c 2006-09-05 22:54:11 +0200
@@ -58,7 +58,10 @@
static char base64[64];
static char b2a[256];
@@ -451,7 +452,7 @@
#define ERANGE 34
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
-+++ utils/Makefile 2006-09-05 22:49:34 +0200
++++ utils/Makefile 2006-09-05 22:54:11 +0200
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
