From owner-svn-ports-all@freebsd.org Tue Jun 20 13:21:30 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98254D98905; Tue, 20 Jun 2017 13:21:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C071817C0; Tue, 20 Jun 2017 13:21:30 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KDLTc9042838; Tue, 20 Jun 2017 13:21:29 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KDLTDx042837; Tue, 20 Jun 2017 13:21:29 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201706201321.v5KDLTDx042837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 20 Jun 2017 13:21:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443953 - head/net/asterisk11 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jun 2017 13:21:30 -0000 Author: madpilot Date: Tue Jun 20 13:21:29 2017 New Revision: 443953 URL: https://svnweb.freebsd.org/changeset/ports/443953 Log: - Prevent asterisk build system from unconditionally using -march=native [1] - Add an OPTIMIZED_CFLAGS option, disabled by default, to allow enabling the native flag - While here, convert to option target helpers. Reported by: "Andrey V. Elsukov" (via email) [1] MFH: 2017Q2 Modified: head/net/asterisk11/Makefile Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Tue Jun 20 13:19:55 2017 (r443952) +++ head/net/asterisk11/Makefile Tue Jun 20 13:21:29 2017 (r443953) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.25.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -54,7 +54,7 @@ CONFLICTS_BUILD= linuxthreads-* pjsip-* CONFLICTS_INSTALL= asterisk*-13* OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ - MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \ + MP3PLAYER OOH323 OPTIMIZED_CFLAGS RADIUS SNMP SPANDSP SRTP \ SYSINFO UUID XMPP OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GSM LUA MP3PLAYER \ NEWT MYSQL ODBC PGSQL RADIUS SNMP SPANDSP SPEEX \ @@ -218,40 +218,43 @@ PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete -.if ${PORT_OPTIONS:MG729} +post-extract-G729-on: ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds -.endif post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure -.if ${PORT_OPTIONS:MSYSINFO} - @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile -.else - @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile -.endif .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif +post-patch-SYSINFO-on: + @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile + +post-patch-SYSINFO-off: + @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile + post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts -.if ${PORT_OPTIONS:MMYSQL} + +post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts -.endif -.if ${PORT_OPTIONS:MOOH323} + +post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts -.endif -.if ${PORT_OPTIONS:MNEWG711} + +post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts -.endif + +post-configure-OPTIMIZED_CFLAGS-off: + @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts pre-build: @${MKDIR} ${WRKSRC}/res/pjproject/pjnath/lib ${WRKSRC}/res/pjproject/pjlib-util/lib \