From owner-svn-src-all@FreeBSD.ORG Sun Nov 14 21:20:52 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D49B5106564A; Sun, 14 Nov 2010 21:20:52 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id E8F878FC08; Sun, 14 Nov 2010 21:20:51 +0000 (UTC) Received: by wwi14 with SMTP id 14so298345wwi.31 for ; Sun, 14 Nov 2010 13:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=UXsuT7/pXe6suTKLTn9D/mtLlbAiTCKmP8LKmCHKjAM=; b=tXjC3lxuenbwoohskxp1vPSbv6faYB5VbT5dJPE5sbmxeLt9kXm7cdUgjAYh7CxWyo 4P/Fr/ZyW35yLpmGsZa8T9QhYJNv3fYnb5IUGbqiYZ6zxMeW9sNza1Gnnnb99Bx9A8tB aSd34JG6uoJMsc+hsRA3bsykn8kXNb8FWozFk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=dpPFQxBNv95KQdiaji3pdgWQ/nirsMSjyP+Vq7eQsBx61IGctpHUWtKy26by+Rser2 vEBZ1vD7dzJd6FbdE01j+MmxbFvO44XvHtsfOoBDrbz7XmZ+2WvsCcyd4WtKaLZhvcnu ir5SNiY61etn+9sbu70TCobc2PfjKq+BcDgl8= Received: by 10.216.177.81 with SMTP id c59mr6228085wem.81.1289769650243; Sun, 14 Nov 2010 13:20:50 -0800 (PST) Received: from localhost ([109.169.29.56]) by mx.google.com with ESMTPS id p4sm3364544wer.29.2010.11.14.13.20.47 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 13:20:49 -0800 (PST) From: Anonymous To: Konstantin Belousov References: <201011141824.oAEIOCtN089920@svn.freebsd.org> Date: Mon, 15 Nov 2010 00:20:37 +0300 In-Reply-To: <201011141824.oAEIOCtN089920@svn.freebsd.org> (Konstantin Belousov's message of "Sun, 14 Nov 2010 18:24:12 +0000 (UTC)") Message-ID: <86wrofob4q.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, freebsd-ports@freebsd.org Subject: Re: svn commit: r215309 - in head/sys: amd64/amd64 i386/i386 sys vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Nov 2010 21:20:53 -0000 Konstantin Belousov writes: > Author: kib > Date: Sun Nov 14 18:24:12 2010 > New Revision: 215309 > URL: http://svn.freebsd.org/changeset/base/215309 > > Log: > Use symbolic names instead of hardcoding values for magic p_osrel constants. > > MFC after: 1 week [...] > Modified: head/sys/sys/param.h > ============================================================================== > --- head/sys/sys/param.h Sun Nov 14 18:05:03 2010 (r215308) > +++ head/sys/sys/param.h Sun Nov 14 18:24:12 2010 (r215309) > @@ -60,6 +60,11 @@ > #undef __FreeBSD_version > #define __FreeBSD_version 900025 /* Master, propagated to newvers */ > > +#ifdef _KERNEL > +#define __FreeBSD_version_SIGSEGV 700004 > +#define __FreeBSD_version_MAP_ANON 800104 > +#endif > + This breaks bsd.port.mk regexp to determine OSVERSION. # Get __FreeBSD_version .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h .elif exists(/usr/src/sys/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank::]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif $ make -V OSVERSION 900025 700004 800104 And every port chokes on it. $ make -C devel/libpthread-stubs "Makefile", line 26: warning: String comparison operator should be either == or != "Makefile", line 26: Malformed conditional (${OSVERSION} < 700000) "Makefile", line 28: if-less endif "/usr/ports/Mk/bsd.port.mk", line 1739: warning: String comparison operator should be either == or != "/usr/ports/Mk/bsd.port.mk", line 1739: Malformed conditional (defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )) "/usr/ports/Mk/bsd.port.mk", line 6394: if-less endif make: fatal errors encountered -- cannot continue %% Index: Mk/bsd.port.mk =================================================================== RCS file: /a/.cvsup/ports/Mk/bsd.port.mk,v retrieving revision 1.654 diff -u -p -r1.654 bsd.port.mk --- Mk/bsd.port.mk 8 Nov 2010 16:07:03 -0000 1.654 +++ Mk/bsd.port.mk 14 Nov 2010 21:18:32 -0000 @@ -1219,9 +1219,9 @@ OSREL!= ${UNAME} -r | ${SED} -e 's/[-(]. # Get __FreeBSD_version .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) -OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h +OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version[[:blank:]]/ {print $$3}' < /usr/include/sys/param.h .elif exists(/usr/src/sys/sys/param.h) -OSVERSION!= ${AWK} '/^\#define[[:blank::]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h +OSVERSION!= ${AWK} '/^\#define[[:blank::]]__FreeBSD_version[[:blank:]]/ {print $$3}' < /usr/src/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif %%