From owner-svn-ports-branches@freebsd.org Mon Dec 26 10:04:32 2016 Return-Path: Delivered-To: svn-ports-branches@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 A03E8C90232; Mon, 26 Dec 2016 10:04:32 +0000 (UTC) (envelope-from rakuco@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 4FD295FB; Mon, 26 Dec 2016 10:04:32 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQA4Vs7031564; Mon, 26 Dec 2016 10:04:31 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQA4VT0031562; Mon, 26 Dec 2016 10:04:31 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201612261004.uBQA4VT0031562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 26 Dec 2016 10:04:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429489 - branches/2016Q4/databases/sqlite3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 10:04:32 -0000 Author: rakuco Date: Mon Dec 26 10:04:31 2016 New Revision: 429489 URL: https://svnweb.freebsd.org/changeset/ports/429489 Log: MFH: r429442 Improve the way CFLAGS and CPPFLAGS are set. ":?" is not supported by fmake from FreeBSD 9, so replace it with an explicit version check. The end result was still the desired one (-DHAVE_STRCHRNUL=1 was not passed on FreeBSD 9). While here, also improve the version check by including DragonFly (which supports strchrnul(3) according to its online man page) and restricting the FreeBSD version check to the revision range after strchrnul(3) was added to base. Also stop passing -Os when building in debug mode, and set UNICODE61_CPPFLAGS to pet portlint. PR: 214608 Submitted by: Pavel Volkov (maintainer) Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/databases/sqlite3/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/databases/sqlite3/Makefile ============================================================================== --- branches/2016Q4/databases/sqlite3/Makefile Mon Dec 26 10:00:10 2016 (r429488) +++ branches/2016Q4/databases/sqlite3/Makefile Mon Dec 26 10:04:31 2016 (r429489) @@ -18,11 +18,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -# Platform Configuration -CFLAGS+= -Os -CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -CPPFLAGS+= ${OSVERSION<1000000:?:-DHAVE_STRCHRNUL=1} - MAKE_JOBS_UNSAFE= yes # Compilation Options For SQLite https://www.sqlite.org/compile.html @@ -174,6 +169,7 @@ ICU_LIB_DEPENDS= libicudata.so:devel/icu ICU_CPPFLAGS= `${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1 ICU_LDFLAGS= `${LOCALBASE}/bin/icu-config --ldflags` +UNICODE61_CPPFLAGS= "" UNICODE61_CPPFLAGS_OFF= -DSQLITE_DISABLE_FTS3_UNICODE=1 READLINES_CONFIGURE_ON= --enable-readline @@ -197,6 +193,15 @@ UNKNOWN_SQL_CPPFLAGS= -DSQLITE_ENABLE_UN .include +# Platform Configuration +.if !defined(WITH_DEBUG) +CFLAGS+= -Os +.endif +CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 +.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000029) +CPPFLAGS+= -DHAVE_STRCHRNUL=1 +.endif + post-configure: @${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}" @${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}"