NetBSD Problem Report #29401

From njoly@pasteur.fr  Wed Feb 16 15:29:12 2005
Return-Path: <njoly@pasteur.fr>
Received: from electre.pasteur.fr (electre.pasteur.fr [157.99.64.120])
	by narn.netbsd.org (Postfix) with ESMTP id 5893763B400
	for <gnats-bugs@gnats.NetBSD.org>; Wed, 16 Feb 2005 15:29:11 +0000 (UTC)
Message-Id: <20050216152907.120AC6B403@lanfeust.sis.pasteur.fr>
Date: Wed, 16 Feb 2005 16:29:07 +0100 (CET)
From: njoly@pasteur.fr
Reply-To: njoly@pasteur.fr
To: gnats-bugs@netbsd.org
Subject: Makefiles warnings while compiling X from xsrc
X-Send-Pr-Version: 3.95

>Number:         29401
>Category:       xsrc
>Synopsis:       Makefiles warnings while compiling X from xsrc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tsutsui
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 16 15:30:00 +0000 2005
>Closed-Date:    Thu Feb 17 11:27:35 +0000 2005
>Last-Modified:  Thu Feb 17 11:27:35 +0000 2005
>Originator:     Nicolas Joly
>Release:        NetBSD 2.99.16
>Organization:
Institut Pasteur, Paris.
>Environment:
System: NetBSD lanfeust.sis.pasteur.fr 2.99.16 NetBSD 2.99.16 (LANFEUST) #7: Wed Feb 16 11:46:16 CET 2005 njoly@lanfeust.sis.pasteur.fr:/local/src/NetBSD/obj/amd64/sys/arch/amd64/compile/LANFEUST amd64
Architecture: x86_64
Machine: amd64
>Description:
I'm getting many warnings during xsrc Makefiles generation on amd64 :

In file included from ../config/cf/Imake.tmpl:104,
                 from Imakefile.c:16:
../config/cf/NetBSD.cf:659: warning: "NetBSDMachineDefines" redefined
../config/cf/NetBSD.cf:328: warning: this is the location of the previous definition

>How-To-Repeat:
cd xsrc && make
>Fix:
Index: xfree/xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
retrieving revision 1.75
diff -u -r1.75 NetBSD.cf
--- xfree/xc/config/cf/NetBSD.cf	10 Feb 2005 16:16:24 -0000	1.75
+++ xfree/xc/config/cf/NetBSD.cf	16 Feb 2005 15:11:16 -0000
@@ -324,10 +324,6 @@
 /* End of MACHINE_CPU specific options */


-#ifndef NetBSDMachineDefines
-#define NetBSDMachineDefines /**/
-#endif
-
 #define StandardDefines	-DCSRG_BASED NetBSDMachineDefines

 /* Citrus mb locale were added in 1.5P */
@@ -924,6 +920,9 @@
 #ifndef ServerOSDefines
 # define ServerOSDefines	XFree86ServerOSDefines
 #endif
+#ifndef NetBSDMachineDefines
+#define NetBSDMachineDefines /**/
+#endif
 /* End of MACHINE specific options */

 #include <xfree86.cf>

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: xsrc-manager->tsutsui
Responsible-Changed-By: tron@netbsd.org
Responsible-Changed-When: Wed, 16 Feb 2005 15:46:10 +0000
Responsible-Changed-Why:
Izumi Tsutsui's currently looking after "NetBSD.cf".


From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
To: gnats-bugs@netbsd.org
Cc: xsrc-manager@netbsd.org, gnats-admin@netbsd.org,
	tsutsui@ceres.dti.ne.jp
Subject: Re: xsrc/29401: Makefiles warnings while compiling X from xsrc
Date: Thu, 17 Feb 2005 18:04:40 +0900

 > >Synopsis:       Makefiles warnings while compiling X from xsrc
  :
 > >Description:
 > I'm getting many warnings during xsrc Makefiles generation on amd64 :
  :

 Hmm, I'd like to move the definition of -D__AMD64__ in NetBSDMachineDefines
 from MACHINE dependent part to MACHINE_CPU part because:
 - __AMD64__ is also used in some libraries (not only by Xserver)
 - share/mk/bsd.x11.mk implicitly add -D__AMD64__ if MACHINE_ARCH == x86_64
 - currently amd64 is the only MACHINE which have x86_64 MACHINE_CPU anyway
 (though the real fix is to add "defined(__x86_64__)" where appropriate, IMO)

 Would you please confirm if the attached version properly works?

 Index: NetBSD.cf
 ===================================================================
 RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
 retrieving revision 1.75
 diff -u -r1.75 NetBSD.cf
 --- NetBSD.cf	10 Feb 2005 16:16:24 -0000	1.75
 +++ NetBSD.cf	17 Feb 2005 08:52:36 -0000
 @@ -315,6 +315,7 @@
  /* x86_64 */
  #if defined(x86_64Architecture)
  # define OptimizedCDebugFlags	-O2	/* XXX not needed anymore? */
 +# define NetBSDMachineDefines	-D__AMD64__
  #endif

  /* set default */
 @@ -656,7 +657,6 @@
  # define BuildServer		YES
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  # define ServerExtraDefines	GccGasOption XFree86ServerDefines -D_XSERVER64
 -# define NetBSDMachineDefines	-D__AMD64__
  # ifndef XFree86ConsoleDefines
  # define XFree86ConsoleDefines	-DWSCONS_SUPPORT -DPCVT_SUPPORT
  # endif

From: Nicolas Joly <njoly@pasteur.fr>
To: gnats-bugs@NetBSD.org
Cc: tsutsui@NetBSD.org, gnats-admin@NetBSD.org,
	netbsd-bugs@NetBSD.org
Subject: Re: xsrc/29401: Makefiles warnings while compiling X from xsrc
Date: Thu, 17 Feb 2005 11:24:38 +0100

 On Thu, Feb 17, 2005 at 09:05:02AM +0000, Izumi Tsutsui wrote:
 > The following reply was made to PR xsrc/29401; it has been noted by GNATS.
 > 
 > From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
 > To: gnats-bugs@netbsd.org
 > Cc: xsrc-manager@netbsd.org, gnats-admin@netbsd.org,
 > 	tsutsui@ceres.dti.ne.jp
 > Subject: Re: xsrc/29401: Makefiles warnings while compiling X from xsrc
 > Date: Thu, 17 Feb 2005 18:04:40 +0900
 > 
 >  > >Synopsis:       Makefiles warnings while compiling X from xsrc
 >   :
 >  > >Description:
 >  > I'm getting many warnings during xsrc Makefiles generation on amd64 :
 >   :
 >  
 >  Hmm, I'd like to move the definition of -D__AMD64__ in NetBSDMachineDefines
 >  from MACHINE dependent part to MACHINE_CPU part because:
 >  - __AMD64__ is also used in some libraries (not only by Xserver)
 >  - share/mk/bsd.x11.mk implicitly add -D__AMD64__ if MACHINE_ARCH == x86_64
 >  - currently amd64 is the only MACHINE which have x86_64 MACHINE_CPU anyway
 >  (though the real fix is to add "defined(__x86_64__)" where appropriate, IMO)
 >  
 >  Would you please confirm if the attached version properly works?

 Works fine. Thanks.

 -- 
 Nicolas Joly

 Biological Software and Databanks.
 Institut Pasteur, Paris.

From: Izumi Tsutsui <tsutsui@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: PR/29401 CVS commit: xsrc/xfree/xc/config/cf
Date: Thu, 17 Feb 2005 11:26:42 +0000 (UTC)

 Module Name:	xsrc
 Committed By:	tsutsui
 Date:		Thu Feb 17 11:26:42 UTC 2005

 Modified Files:
 	xsrc/xfree/xc/config/cf: NetBSD.cf

 Log Message:
 Move a definition of -D__AMD64__ in NetBSDMachineDefines for amd64
 from MACHINE dependent part to MACHINE_CPU part because:
 - __AMD64__ is also used in some libraries (not only by Xserver)
 - share/mk/bsd.x11.mk implicitly add -D__AMD64__ if MACHINE_ARCH == x86_64
 - currently amd64 is the only MACHINE which have x86_64 MACHINE_CPU anyway
 (though the real fix is to add "defined(__x86_64__)" where appropriate)

 Fixes PR xsrc/29401.


 To generate a diff of this commit:
 cvs rdiff -r1.75 -r1.76 xsrc/xfree/xc/config/cf/NetBSD.cf

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: tsutsui@netbsd.org
State-Changed-When: Thu, 17 Feb 2005 11:27:35 +0000
State-Changed-Why:
Fix committed. Thanks.


>Unformatted:

Home	PR Database Search