Date: Fri, 1 May 2020 17:14:22 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533566 - in head/net/asterisk16: . files Message-ID: <202005011714.041HEMDS039769@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri May 1 17:14:21 2020 New Revision: 533566 URL: https://svnweb.freebsd.org/changeset/ports/533566 Log: - Remove bashisms from configure script which can cause wrong options being passed to bundled pjproject configure script - Prevent pjproject build from trying to touch, calculate checksum and download the pjproject distribution file itself. This can cause build failures in poudriere Reported by: cmt Tested by: cmt Modified: head/net/asterisk16/Makefile head/net/asterisk16/files/patch-configure head/net/asterisk16/files/patch-third-party_pjproject_Makefile Modified: head/net/asterisk16/Makefile ============================================================================== --- head/net/asterisk16/Makefile Fri May 1 17:03:58 2020 (r533565) +++ head/net/asterisk16/Makefile Fri May 1 17:14:21 2020 (r533566) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 16.10.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \ http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP Modified: head/net/asterisk16/files/patch-configure ============================================================================== --- head/net/asterisk16/files/patch-configure Fri May 1 17:03:58 2020 (r533565) +++ head/net/asterisk16/files/patch-configure Fri May 1 17:14:21 2020 (r533566) @@ -1,6 +1,6 @@ ---- configure.orig 2018-08-08 16:02:31 UTC +--- configure.orig 2020-04-30 14:11:40 UTC +++ configure -@@ -4661,8 +4661,6 @@ case "${host_os}" in +@@ -4687,8 +4687,6 @@ case "${host_os}" in ;; dragonfly*|freebsd*) ac_default_prefix=/usr/local @@ -9,8 +9,39 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 +@@ -9230,25 +9228,25 @@ $as_echo "configuring" >&6; } + this_host=$(./config.sub $(./config.guess)) + if test "$build" != "$this_host" ; then +- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias" + fi + if test "$host" != "$this_host" ; then +- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias" + fi + # This was a copy of the autoconf generated code from the root ./configure. + # Hopefully, when you read this, the code is still the same. + if test "${with_ssl+set}" = set; then : + case $with_ssl in + n|no) +- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl" + ;; + y|ye|yes) + # Not to mention SSL is the default in PJProject and means "autodetect". + # In Asterisk, "./configure --with-ssl" means "must be present". +- PJPROJECT_CONFIGURE_OPTS+="" ++ #PJPROJECT_CONFIGURE_OPTS+="" + ;; + *) +- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}" ++ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" + ;; + esac + fi +@@ -20351,6 +20349,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <sys/types.h> @@ -18,7 +49,7 @@ #include <ifaddrs.h> int main () -@@ -29156,6 +29156,8 @@ fi +@@ -29510,6 +29510,8 @@ fi for ver in 5.3 5.2 5.1; do @@ -27,7 +58,7 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. -@@ -29170,13 +29172,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; +@@ -29524,13 +29526,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` @@ -44,7 +75,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -29218,7 +29220,7 @@ fi +@@ -29572,7 +29574,7 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -53,7 +84,7 @@ # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" -@@ -29228,8 +29230,8 @@ fi +@@ -29582,8 +29584,8 @@ fi # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" @@ -64,7 +95,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : LUA_HEADER_FOUND=1 else -@@ -29256,9 +29258,9 @@ fi +@@ -29610,9 +29612,9 @@ fi if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then Modified: head/net/asterisk16/files/patch-third-party_pjproject_Makefile ============================================================================== --- head/net/asterisk16/files/patch-third-party_pjproject_Makefile Fri May 1 17:03:58 2020 (r533565) +++ head/net/asterisk16/files/patch-third-party_pjproject_Makefile Fri May 1 17:14:21 2020 (r533566) @@ -1,6 +1,23 @@ ---- third-party/pjproject/Makefile.orig 2020-03-12 14:44:05 UTC +--- third-party/pjproject/Makefile.orig 2020-04-30 14:11:40 UTC +++ third-party/pjproject/Makefile -@@ -155,7 +155,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES) +@@ -88,14 +88,10 @@ _all: $(TARGETS) + + .DELETE_ON_ERROR: + +-$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak +- $(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\ +- $(TARBALL_DOWNLOAD)) || (rm -rf $@ ;\ +- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) ++$(DOWNLOAD_DIR)/$(TARBALL_FILE): ++ @true + + source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE) +- $(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\ +- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) + $(ECHO_PREFIX) Unpacking $< + -@rm -rf source pjproject-*/ >/dev/null 2>&1 + $(CMD_PREFIX) $(TAR) -xjf $< +@@ -155,7 +151,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES) pjproject.symbols: $(ALL_LIB_FILES) $(ECHO_PREFIX) Generating symbols
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005011714.041HEMDS039769>