Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6093] branches/1.0/package/asterisk
|
From: <abe...@us...> - 2013-05-18 22:03:38
|
Revision: 6093
http://sourceforge.net/p/astlinux/code/6093
Author: abelbeck
Date: 2013-05-18 22:03:36 +0000 (Sat, 18 May 2013)
Log Message:
-----------
asterisk, version bump to 1.8.22.0 and 11.4.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch
branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch
Deleted: branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.2-revert-378582.patch 2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,50 +0,0 @@
---- asterisk-11.2.0/res/pjproject/aconfigure 2013/01/04 22:18:11 378582
-+++ asterisk-11.2.0/res/pjproject/aconfigure 2013/01/04 22:18:21 378581
-@@ -2401,7 +2401,7 @@
- program_prefix=${target_alias}-
- ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
-
--ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
-+ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
-
-
-
-@@ -7799,6 +7799,7 @@
- "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
- "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
- "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
-+ "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
- "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
- "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
- "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
-
---- asterisk-11.2.0/res/pjproject/aconfigure.ac 2013/01/04 22:18:11 378582
-+++ asterisk-11.2.0/res/pjproject/aconfigure.ac 2013/01/04 22:18:21 378581
-@@ -13,6 +13,7 @@
- ])
- AC_CONFIG_FILES([build.mak
- build/os-auto.mak
-+ build/cc-auto.mak
- pjlib/build/os-auto.mak
- pjlib-util/build/os-auto.mak
- pjmedia/build/os-auto.mak
-
-
---- asterisk-11.2.0/res/pjproject/build/common.mak 2013/01/04 22:18:11 378582
-+++ asterisk-11.2.0/res/pjproject/build/common.mak 2013/01/04 22:18:21 378581
-@@ -17,6 +17,15 @@
- -include cc-$(CC_NAME).mak
-
- #
-+# Include auto configured compiler specification.
-+# This will override the compiler settings above.
-+# Currently this is made OPTIONAL, to prevent people
-+# from getting errors because they don't re-run ./configure
-+# after downloading new PJSIP.
-+#
-+-include $(PJDIR)/build/cc-auto.mak
-+
-+#
- # Include global machine specific definitions
- #
- include $(PJDIR)/build/m-$(MACHINE_NAME).mak
Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380671.patch 2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,292 +0,0 @@
-Index: res/pjproject/aconfigure
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure (revision 380670)
-+++ asterisk-11.3.0/res/pjproject/aconfigure (revision 380671)
-@@ -649,10 +649,12 @@
- CC_OUT
- LIBEXT2
- LIBEXT
--RANLIB
- LDOUT
- LD
-+AR_FLAGS
-+ac_ct_AR
- AR
-+RANLIB
- ac_ct_CXX
- CXXFLAGS
- CXX
-@@ -3468,18 +3470,205 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--if test -z "$CROSS_COMPILE"; then
-- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$RANLIB"; then
-+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
- fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
--if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
-
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+ ac_ct_RANLIB=$RANLIB
-+ # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_RANLIB"; then
-+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_RANLIB="ranlib"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+if test -n "$ac_tool_prefix"; then
-+ for ac_prog in ar gar
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$AR"; then
-+ ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ test -n "$AR" && break
-+ done
-+fi
-+if test -z "$AR"; then
-+ ac_ct_AR=$AR
-+ for ac_prog in ar gar
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_AR"; then
-+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_AR="$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ test -n "$ac_ct_AR" && break
-+done
-+
-+ if test "x$ac_ct_AR" = x; then
-+ AR=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ AR=$ac_ct_AR
-+ fi
-+fi
-+
-+
-+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
-+
- if test "$LD" = ""; then LD="$CC"; fi
-
- if test "$LDOUT" = ""; then LDOUT="-o "; fi
-
--if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
--
- if test "$OBJEXT" = ""; then OBJEXT='o'; fi
-
- if test "$LIBEXT" = ""; then LIBEXT='a'; fi
-Index: res/pjproject/build/rules.mak
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/rules.mak (revision 380670)
-+++ asterisk-11.3.0/res/pjproject/build/rules.mak (revision 380671)
-@@ -72,6 +72,7 @@
- @echo DEPFLAGS=$(DEPFLAGS)
- @echo CC=$(CC)
- @echo AR=$(AR)
-+ @echo AR_FLAGS=$(AR_FLAGS)
- @echo RANLIB=$(RANLIB)
-
- print_bin: print_common
-@@ -84,7 +85,7 @@
-
- $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
- if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-- $(AR) $(LIB) $(OBJS)
-+ $(AR) $(AR_FLAGS) $(LIB) $(OBJS)
- $(RANLIB) $(LIB)
-
- $(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-Index: res/pjproject/build/cc-auto.mak.in
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in (revision 380670)
-+++ asterisk-11.3.0/res/pjproject/build/cc-auto.mak.in (revision 380671)
-@@ -1,6 +1,7 @@
- export CC = @CC@ -c
- export CXX = @CXX@ -c
- export AR = @AR@
-+export AR_FLAGS = @AR_FLAGS@
- export LD = @LD@
- export LDOUT = -o
- export RANLIB = @RANLIB@
-Index: res/pjproject/aconfigure.ac
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380670)
-+++ asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380671)
-@@ -40,21 +40,15 @@
- AC_PROG_CXX
- AC_LANG_C
-
--dnl #
--dnl # Setup CROSS_COMPILE variable
--dnl #
--if test -z "$CROSS_COMPILE"; then
-- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
--fi
-+AC_PROG_RANLIB
-+AC_CHECK_TOOLS([AR], [ar gar], :)
-
--if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
--AC_SUBST(AR)
-+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
-+AC_SUBST(AR_FLAGS)
- if test "$LD" = ""; then LD="$CC"; fi
- AC_SUBST(LD)
- if test "$LDOUT" = ""; then LDOUT="-o "; fi
- AC_SUBST(LDOUT)
--if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
--AC_SUBST(RANLIB)
- if test "$OBJEXT" = ""; then OBJEXT='o'; fi
- AC_SUBST(OBJEXT)
- if test "$LIBEXT" = ""; then LIBEXT='a'; fi
Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380672.patch 2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,133 +0,0 @@
-Index: res/pjproject/aconfigure
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure (revision 380671)
-+++ asterisk-11.3.0/res/pjproject/aconfigure (revision 380672)
-@@ -4079,6 +4079,51 @@
-
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-+$as_echo_n "checking for sin in -lm... " >&6; }
-+if test "${ac_cv_lib_m_sin+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char sin ();
-+int
-+main ()
-+{
-+return sin ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_m_sin=yes
-+else
-+ ac_cv_lib_m_sin=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-+$as_echo "$ac_cv_lib_m_sin" >&6; }
-+if test "x$ac_cv_lib_m_sin" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBM 1
-+_ACEOF
-+
-+ LIBS="-lm $LIBS"
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
- $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
- if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
-@@ -4865,56 +4910,11 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
- $as_echo "Checking if floating point is disabled... no" >&6; }
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5
--$as_echo_n "checking for fmod in -lm... " >&6; }
--if test "${ac_cv_lib_m_fmod+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char fmod ();
--int
--main ()
--{
--return fmod ();
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_m_fmod=yes
--else
-- ac_cv_lib_m_fmod=no
- fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5
--$as_echo "$ac_cv_lib_m_fmod" >&6; }
--if test "x$ac_cv_lib_m_fmod" = x""yes; then :
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBM 1
--_ACEOF
-
-- LIBS="-lm $LIBS"
-
--fi
-
--
--fi
--
--
--
- ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
- if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
- $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
-Index: res/pjproject/aconfigure.ac
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380671)
-+++ asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380672)
-@@ -106,6 +106,7 @@
- AC_CHECK_LIB(socket,puts)
- AC_CHECK_LIB(rt,puts)
- AC_CHECK_LIB(nsl,puts)
-+AC_CHECK_LIB(m,sin)
- AC_CHECK_LIB(uuid,uuid_generate)
- AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
-
-@@ -178,7 +179,6 @@
- [
- AC_DEFINE(PJ_HAS_FLOATING_POINT,1)
- AC_MSG_RESULT([Checking if floating point is disabled... no])
-- AC_CHECK_LIB(m,fmod)
- ])
-
-
Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380673.patch 2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,213 +0,0 @@
-Index: res/pjproject/pjnath/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjnath/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjnath/build/Makefile (revision 380673)
-@@ -92,18 +92,24 @@
- dep: depend
- distclean: realclean
-
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJNATH_LIB) $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE)
-
--pjnath:
-+pjnath: $(PJNATH_LIB)
-+$(PJNATH_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB)
-
--pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjnath-test: $(PJNATH_TEST_EXE)
-+$(PJNATH_TEST_EXE): $(PJNATH_LIB)
- $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE)
-
--pjturn-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjturn-client: $(PJTURN_CLIENT_EXE)
-+$(PJTURN_CLIENT_EXE): $(PJNATH_LIB)
- $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $(PJTURN_CLIENT_EXE)
-
--pjturn-srv: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB)
-+pjturn-srv: $(PJTURN_SRV_EXE)
-+$(PJTURN_SRV_EXE): $(PJNATH_LIB)
- $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $(PJTURN_SRV_EXE)
-
- .PHONY: ../lib/pjnath.ko
-Index: res/pjproject/pjsip/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjsip/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjsip/build/Makefile (revision 380673)
-@@ -106,8 +106,6 @@
- #
- TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test
-
--.PHONY: $(TARGETS)
--
- all: $(TARGETS)
-
- doc:
-@@ -124,21 +122,28 @@
- dep: depend
- distclean: realclean
-
--.PHONY: dep depend pjsip pjsip-ua pjsua-lib clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB) $(TEST_EXE)
-
--pjsip:
-+pjsip: $(PJSIP_LIB)
-+$(PJSIP_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB)
-
--pjsip-ua:
-+pjsip-ua: $(PJSIP_UA_LIB)
-+$(PJSIP_UA_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB)
-
--pjsip-simple:
-+pjsip-simple: $(PJSIP_SIMPLE_LIB)
-+$(PJSIP_SIMPLE_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB)
-
--pjsua-lib:
-+pjsua-lib: $(PJSUA_LIB_LIB)
-+$(PJSUA_LIB_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB)
-
--pjsip-test:
-+pjsip-test: $(TEST_EXE)
-+$(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB)
- $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE)
-
- .PHONY: ../lib/pjsip.ko
-Index: res/pjproject/pjsip-apps/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjsip-apps/build/Makefile (revision 380673)
-@@ -57,8 +57,6 @@
- #
- TARGETS := pjsua pjsystest samples
-
--.PHONY: $(TARGETS)
--
- all: $(TARGETS)
-
- doc:
-@@ -66,12 +64,16 @@
- dep: depend
- distclean: realclean
-
--.PHONY: dep depend pjsua clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJSUA_EXE) $(PJSYSTEST_EXE)
-
--pjsua:
-+pjsua: $(PJSUA_EXE)
-+$(PJSUA_EXE):
- $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
-
--pjsystest:
-+pjsystest: $(PJSYSTEST_EXE)
-+$(PJSYSTEST_EXE):
- $(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(PJSYSTEST_EXE)
-
- samples:
-Index: res/pjproject/pjmedia/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjmedia/build/Makefile (revision 380673)
-@@ -156,24 +156,32 @@
- dep: depend
- distclean: realclean
-
--.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_AUDIODEV_LIB) $(PJSDP_LIB) $(PJMEDIA_TEST_EXE)
-
--pjmedia:
-+pjmedia: $(PJMEDIA_LIB)
-+$(PJMEDIA_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
-
--pjmedia-codec:
-+pjmedia-codec: $(PJMEDIA_CODEC_LIB)
-+$(PJMEDIA_CODEC_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
-
--pjmedia-videodev:
-+pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
-+$(PJMEDIA_VIDEODEV_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB)
-
--pjmedia-audiodev:
-+pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
-+$(PJMEDIA_AUDIODEV_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB)
-
--pjsdp:
-+pjsdp: $(PJSDP_LIB)
-+$(PJSDP_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB)
-
--pjmedia-test: $(PJMEDIA_LIB)
-+pjmedia-test: $(PJMEDIA_TEST_EXE)
-+$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)
- $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE)
-
- .PHONY: ../lib/pjmedia.ko
-Index: res/pjproject/pjlib/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjlib/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjlib/build/Makefile (revision 380673)
-@@ -77,17 +77,21 @@
- echo '$(TEST_EXE): $(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend
-
-
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJLIB_LIB) $(TEST_EXE)
-
- dep: depend
-
--pjlib: ../include/pj/config_site.h
-+pjlib: $(PJLIB_LIB)
-+$(PJLIB_LIB): ../include/pj/config_site.h
- $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(PJLIB_LIB)
-
- ../include/pj/config_site.h:
- touch ../include/pj/config_site.h
--
--pjlib-test:
-+
-+pjlib-test: $(TEST_EXE)
-+$(TEST_EXE): $(PJLIB_LIB)
- $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(TEST_EXE)
-
- .PHONY: ../lib/pjlib.ko
-Index: res/pjproject/pjlib-util/build/Makefile
-===================================================================
---- asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile (revision 380672)
-+++ asterisk-11.3.0/res/pjproject/pjlib-util/build/Makefile (revision 380673)
-@@ -69,12 +69,16 @@
- dep: depend
- distclean: realclean
-
--.PHONY: dep depend pjlib pjlib-test clean realclean distclean
-+.PHONY: dep depend clean realclean distclean
-+.PHONY: $(TARGETS)
-+.PHONY: $(PJLIB_UTIL_LIB) $(UTIL_TEST_EXE)
-
--pjlib-util:
-+pjlib-util: $(PJLIB_UTIL_LIB)
-+$(PJLIB_UTIL_LIB):
- $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB)
-
--pjlib-util-test:
-+pjlib-util-test: $(UTIL_TEST_EXE)
-+$(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB)
- $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE)
-
- .PHONY: ../lib/pjlib-util.ko
Deleted: branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk-11.3-pjproject-r380816.patch 2013-05-18 22:03:36 UTC (rev 6093)
@@ -1,258 +0,0 @@
-Index: Makefile
-===================================================================
---- asterisk-11.3.0/Makefile (revision 380815)
-+++ asterisk-11.3.0/Makefile (revision 380816)
-@@ -98,12 +98,7 @@
- export LDCONFIG_FLAGS
- export PYTHON
-
--# even though we could use '-include makeopts' here, use a wildcard
--# lookup anyway, so that make won't try to build makeopts if it doesn't
--# exist (other rules will force it to be built if needed)
--ifneq ($(wildcard makeopts),)
-- include makeopts
--endif
-+-include makeopts
-
- # start the primary CFLAGS and LDFLAGS with any that were provided
- # to the configure script
-@@ -311,7 +306,7 @@
- mK=" make"
- endif
-
--all: _cleantest_all
-+all: _all
- @echo " +--------- Asterisk Build Complete ---------+"
- @echo " + Asterisk has successfully been built, and +"
- @echo " + can be installed by running: +"
-@@ -319,7 +314,7 @@
- @echo " + $(mK) install +"
- @echo " +-------------------------------------------+"
-
--full: _cleantest_all_full
-+full: _full
- @echo " +--------- Asterisk Build Complete ---------+"
- @echo " + Asterisk has successfully been built, and +"
- @echo " + can be installed by running: +"
-@@ -328,19 +323,9 @@
- @echo " +-------------------------------------------+"
-
-
--# For parallel builds, we must call cleantest *before* running the
--# other dependencies on _all.
--_cleantest_all: cleantest
-- @$(MAKE) _all
--
--# For parallel builds, we must call cleantest *before* running the
--# other dependencies on _all.
--_cleantest_all_full: cleantest
-- @$(MAKE) _all_full
--
- _all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
-
--_all_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
-+_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
-
- makeopts: configure
- @echo "****"
-@@ -375,7 +360,7 @@
- +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
- +@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
-
--$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
-+$(SUBDIRS): makeopts cleantest main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
-
- ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
- # Non-windows:
-@@ -395,10 +380,10 @@
- res: main
- endif
-
--$(MOD_SUBDIRS):
-+$(MOD_SUBDIRS): makeopts
- +@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-
--$(OTHER_SUBDIRS):
-+$(OTHER_SUBDIRS): makeopts
- +@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
-
- defaults.h: makeopts build_tools/make_defaults_h
-@@ -452,7 +437,7 @@
- rm -rf doc/api
- rm -f build_tools/menuselect-deps
-
--datafiles: _cleantest_all doc/core-en_US.xml
-+datafiles: _all doc/core-en_US.xml
- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail? There are portions here that *could* be customized but might also be
-@@ -473,7 +458,7 @@
- done
- $(MAKE) -C sounds install
-
--doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
-+doc/core-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
- @printf "Building Documentation For: "
- @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
- @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
-@@ -487,7 +472,7 @@
- @echo
- @echo "</docs>" >> $@
-
--doc/full-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
-+doc/full-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
- ifeq ($(PYTHON),:)
- @echo "--------------------------------------------------------------------------"
- @echo "--- Please install python to build full documentation ---"
-@@ -561,7 +546,7 @@
- main-bininstall:
- +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
-
--bininstall: _cleantest_all installdirs $(SUBDIRS_INSTALL) main-bininstall
-+bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
- $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
- $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
- if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
-@@ -916,19 +901,19 @@
- CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
- $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
-
--menuselect/menuselect: menuselect/makeopts
-+menuselect/menuselect: menuselect/makeopts cleantest
- +$(MAKE_MENUSELECT) menuselect
-
--menuselect/cmenuselect: menuselect/makeopts
-+menuselect/cmenuselect: menuselect/makeopts cleantest
- +$(MAKE_MENUSELECT) cmenuselect
-
--menuselect/gmenuselect: menuselect/makeopts
-+menuselect/gmenuselect: menuselect/makeopts cleantest
- +$(MAKE_MENUSELECT) gmenuselect
-
--menuselect/nmenuselect: menuselect/makeopts
-+menuselect/nmenuselect: menuselect/makeopts cleantest
- +$(MAKE_MENUSELECT) nmenuselect
-
--menuselect/makeopts: makeopts
-+menuselect/makeopts: makeopts cleantest
- +$(MAKE_MENUSELECT) makeopts
-
- menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
-@@ -956,7 +941,8 @@
- .PHONY: distclean
- .PHONY: all
- .PHONY: _all
--.PHONY: _cleantest_all
-+.PHONY: full
-+.PHONY: _full
- .PHONY: prereqs
- .PHONY: cleantest
- .PHONY: uninstall
-Index: res/Makefile
-===================================================================
---- asterisk-11.3.0/res/Makefile (revision 380815)
-+++ asterisk-11.3.0/res/Makefile (revision 380816)
-@@ -67,21 +67,25 @@
- ael/pval.o: ael/pval.c
-
- clean::
-- $(MAKE) -C pjproject realclean
-+ @if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
- rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
-
--pjproject/build.mak:
-- cd pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
-+dist-clean::
-+ rm -f pjproject/build.mak
-
--.PHONY : pjproject
--pjproject: pjproject/build.mak
-- # Make sure we always build pjproject with a single job.
-- $(MAKE) -j1 -C pjproject dep
-- $(MAKE) -j1 -C pjproject
-+pjproject/build.mak: pjproject/aconfigure
-+ (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
-
--include pjproject/build.mak
-+ifneq ($(findstring $(MAKECMDGOALS),all),)
-+-include pjproject/build.mak
-+endif
-
--$(PJ_LIB_FILES): pjproject
-+.PHONY: FORCE
-+FORCE:
-+
-+$(PJ_LIB_FILES): FORCE
-+ $(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
-+
- res_rtp_asterisk.o: $(PJ_LIB_FILES)
- res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
- res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-Index: res/pjproject/aconfigure
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure (revision 380815)
-+++ asterisk-11.3.0/res/pjproject/aconfigure (revision 380816)
-@@ -2403,7 +2403,7 @@
- program_prefix=${target_alias}-
- ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
-
--ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
-+ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
-
-
-
-@@ -7988,6 +7988,7 @@
- "pjsip/include/pjsip/sip_autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;;
- "build.mak") CONFIG_FILES="$CONFIG_FILES build.mak" ;;
- "build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;;
-+ "build/cc-auto.mak") CONFIG_FILES="$CONFIG_FILES build/cc-auto.mak" ;;
- "pjlib/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;;
- "pjlib-util/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;;
- "pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
-Index: res/pjproject/build/common.mak
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/common.mak (revision 380815)
-+++ asterisk-11.3.0/res/pjproject/build/common.mak (revision 380816)
-@@ -17,6 +17,15 @@
- -include cc-$(CC_NAME).mak
-
- #
-+# Include auto configured compiler specification.
-+# This will override the compiler settings above.
-+# Currently this is made OPTIONAL, to prevent people
-+# from getting errors because they don't re-run ./configure
-+# after downloading new PJSIP.
-+#
-+-include $(PJDIR)/build/cc-auto.mak
-+
-+#
- # Include global machine specific definitions
- #
- include $(PJDIR)/build/m-$(MACHINE_NAME).mak
-Index: res/pjproject/build/os-auto.mak.in
-===================================================================
---- asterisk-11.3.0/res/pjproject/build/os-auto.mak.in (revision 380815)
-+++ asterisk-11.3.0/res/pjproject/build/os-auto.mak.in (revision 380816)
-@@ -1,8 +1,8 @@
- # @configure_input@
-
--export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@ -g
-+export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CFLAGS@
-
--export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@ -g
-+export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 @CXXFLAGS@
-
- export OS_LDFLAGS := @LDFLAGS@ @LIBS@
-
-Index: res/pjproject/aconfigure.ac
-===================================================================
---- asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380815)
-+++ asterisk-11.3.0/res/pjproject/aconfigure.ac (revision 380816)
-@@ -13,6 +13,7 @@
- ])
- AC_CONFIG_FILES([build.mak
- build/os-auto.mak
-+ build/cc-auto.mak
- pjlib/build/os-auto.mak
- pjlib-util/build/os-auto.mak
- pjmedia/build/os-auto.mak
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2013-05-18 19:56:07 UTC (rev 6092)
+++ branches/1.0/package/asterisk/asterisk.mk 2013-05-18 22:03:36 UTC (rev 6093)
@@ -10,9 +10,9 @@
ASTERISK_VERSION := 1.6.2.21
else
ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.21.0
+ASTERISK_VERSION := 1.8.22.0
else
-ASTERISK_VERSION := 11.3.0
+ASTERISK_VERSION := 11.4.0
endif
endif
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
