packages: asterisk/asterisk.spec, asterisk/gsm-libpoison.patch (NEW) - no /...

[glen]

Author: glen                         Date: Thu Dec 31 18:53:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no /usr/lib poison on lib64 systems

---- Files affected:
packages/asterisk:
   asterisk.spec (1.155 -> 1.156) , gsm-libpoison.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.155 packages/asterisk/asterisk.spec:1.156
--- packages/asterisk/asterisk.spec:1.155	Thu Dec 31 13:27:11 2009
+++ packages/asterisk/asterisk.spec	Thu Dec 31 19:53:54 2009
@@ -1,18 +1,13 @@
 # $Revision$, $Date$
 # TODO:
 # - cgi-bin package - separate, because of suid-root
-# - use shared versions of LIBILBC:=ilbc/libilbc.a
+# - use shared versions of LIBILBC:=ilbc/libilbc.a (ilbc not enabled currently)
 # - CFLAGS passing
 # - fix bluetooth patch
 # - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
-# - libpath:
-#   /usr/bin/ld: skipping incompatible /usr/lib/libpthread.so when searching for -lpthread
-#   /usr/bin/ld: skipping incompatible /usr/lib/libpthread.a when searching for -lpthread
-#   /usr/bin/ld: skipping incompatible /usr/lib/libc.so when searching for -lc
-#   /usr/bin/ld: skipping incompatible /usr/lib/libc.a when searching for -lc
 # - make package for moh sound files
 # - likely odbc and imap broken:
-    #*** WARNING: identical binaries are copied, not linked:
+#   *** WARNING: identical binaries are copied, not linked:
 #        /usr/lib64/asterisk/modules/app_directory_odbc.so
 #   and  /usr/lib64/asterisk/modules/app_directory_imap.so
 #   *** WARNING: identical binaries are copied, not linked:
@@ -41,7 +36,7 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.37
+%define		rel	0.38
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -77,6 +72,7 @@
 Patch14:	%{name}-bristuff-build.patch
 Patch15:	%{name}-bristuff-libpri.patch
 Patch16:	lpc10-system.patch
+Patch17:	gsm-libpoison.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	OSPToolkit
 BuildRequires:	SDL_image-devel
@@ -492,6 +488,7 @@
 %patch15 -p1
 %endif
 %patch16 -p1
+%patch17 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -1195,6 +1192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2009/12/31 18:53:54  glen
+- no /usr/lib poison on lib64 systems
+
 Revision 1.155  2009/12/31 12:27:11  glen
 - build with system lpc10
 - sandsp dep updated

================================================================
Index: packages/asterisk/gsm-libpoison.patch
diff -u /dev/null packages/asterisk/gsm-libpoison.patch:1.1
--- /dev/null	Thu Dec 31 19:53:59 2009
+++ packages/asterisk/gsm-libpoison.patch	Thu Dec 31 19:53:54 2009
@@ -0,0 +1,25 @@
+--- asterisk-1.6.1.12/configure.ac~	2009-12-31 20:48:16.000000000 +0200
++++ asterisk-1.6.1.12/configure.ac	2009-12-31 20:50:47.660532467 +0200
+@@ -657,10 +657,20 @@
+       GSM_INTERNAL="no"
+    fi
+    if test "${GSM_SYSTEM}" = "yes"; then
++
++      case "$host_cpu" in
++      x86_64|s390x)
++          _lib=lib64
++          ;;
++      *)
++          _lib=lib
++          ;;
++      esac
++
+       gsmlibdir=""
+       if test "x${GSM_DIR}" != "x"; then
+-         if test -d ${GSM_DIR}/lib; then
+-            gsmlibdir="-L${GSM_DIR}/lib"
++         if test -d ${GSM_DIR}/${_lib}; then
++            gsmlibdir="-L${GSM_DIR}/${_lib}"
+          else
+             gsmlibdir="-L${GSM_DIR}"
+          fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.155&r2=1.156&f=u