From owner-svn-src-all@FreeBSD.ORG Sun Nov 14 21:45:59 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 97DC61065672; Sun, 14 Nov 2010 21:45:59 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 11A6D8FC15; Sun, 14 Nov 2010 21:45:58 +0000 (UTC) Received: by gxk9 with SMTP id 9so2809520gxk.13 for ; Sun, 14 Nov 2010 13:45:58 -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=tdfqNNfZ/G7WO+YOmVXVdqdAb8eWEnuT8Hk6Tguye74=; b=hmEGpAAwgdrR8AAxY075yhHt3+XEugS+bNFr1kjqFqLVigowxusRH8G3liPoKkz+Sd JiOB+0Dgd/v+s1si0tC3HYgDQQOFqlvX+nRkGsVdB1ClyPMNK9+zf73o9J/Dz3h7PkCD WR/cvTmpO/8AimHyVSDB4KIMx5CXqjbA5gBI0= 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=jT9U0aMqP0PPUdcFD1+/e+jYMJmr7rApA6F3iwnInBUxUQvaengKo6HP+qROXGk8V6 P08edhtjLgkfyXwaA3LzZOXiGlzUoUcQ/DLFFGRjIZjJfh9KCBiyTXVvYpbPXICLlzxo gdJcoTrzq2Ll0yV4j1NJEUuNSPNu5E2VcnF5c= Received: by 10.100.174.5 with SMTP id w5mr3748415ane.28.1289771157405; Sun, 14 Nov 2010 13:45:57 -0800 (PST) Received: from localhost ([95.65.58.105]) by mx.google.com with ESMTPS id g18sm2945850anh.18.2010.11.14.13.45.51 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 13:45:56 -0800 (PST) From: Anonymous To: Kostik Belousov References: <201011141824.oAEIOCtN089920@svn.freebsd.org> <86wrofob4q.fsf@gmail.com> <20101114213749.GW2392@deviant.kiev.zoral.com.ua> Date: Mon, 15 Nov 2010 00:45:11 +0300 In-Reply-To: <20101114213749.GW2392@deviant.kiev.zoral.com.ua> (Kostik Belousov's message of "Sun, 14 Nov 2010 23:37:49 +0200") Message-ID: <86wrofmvfc.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:45:59 -0000 Kostik Belousov writes: > On Mon, Nov 15, 2010 at 12:20:37AM +0300, Anonymous wrote: >> 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. [...] >> >> $ 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 [...] > I think it is better to select different namespace for the special versions. > Can you confirm that the following patch fixes the ports mk for you ? > It is enough to cd /usr/src/include && make install after patching. [...] > diff --git a/sys/sys/param.h b/sys/sys/param.h > index 3e4cdf6..ea90308 100644 > --- a/sys/sys/param.h > +++ b/sys/sys/param.h > @@ -61,8 +61,8 @@ > #define __FreeBSD_version 900025 /* Master, propagated to newvers */ > > #ifdef _KERNEL > -#define __FreeBSD_version_SIGSEGV 700004 > -#define __FreeBSD_version_MAP_ANON 800104 > +#define P_OSREL_SIGSEGV 700004 > +#define P_OSREL_MAP_ANON 800104 > #endif Yep, it does fix.