Subject: Re: pkg/32098: nas build release.h in include
To: None <markd@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,>
From: Gilles Dauphin <Gilles.Dauphin@enst.fr>
List: pkgsrc-bugs
Date: 01/15/2006 12:10:17
The following reply was made to PR pkg/32098; it has been noted by GNATS.
From: Gilles Dauphin <Gilles.Dauphin@enst.fr>
To: markd@netbsd.org, gnats-admin@netbsd.org, dauphin@enst.fr,
gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/32098: nas build release.h in include
Date: Thu, 5 Jan 2006 17:52:55 +0100 (CET)
--Swarm_of_Insects_275_000
Content-Type: TEXT/plain; charset=us-ascii
Content-MD5: n7gUal9KR47bhO2gSdafLg==
> Delivered-To: dauphin@enst.fr
> From: Mark Davies <mark@mcs.vuw.ac.nz>
> To: markd@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org, "Gilles
Dauphin" <dauphin@enst.fr>
> Subject: Re: pkg/32098: nas build release.h in include
> X-Gnats-Was-Stupid: no
> Cc:
> X-Virus-Scanned: amavisd-new at enst.fr
>
> The following reply was made to PR pkg/32098; it has been noted by GNATS.
>
> From: Mark Davies <mark@mcs.vuw.ac.nz>
> To: gnats-bugs@netbsd.org
> Cc:
> Subject: Re: pkg/32098: nas build release.h in include
> Date: Fri, 30 Dec 2005 11:25:55 +1300
>
> On Friday 18 November 2005 03:25, Gilles Dauphin wrote:
> > problem in building nas
> > it can't find release.h when building nasd
>
> > >Fix:
> >
> > --- config/NetAudio.tmpl.orig Sun Feb 15 00:38:32 2004
> > +++ config/NetAudio.tmpl Thu Nov 17 15:09:16 2005
> > @@ -287,6 +287,8 @@
> > release.h: $(TOP)/RELEASE
> > @@\ @echo "static char *release = \"@(#)`cat $(TOP)/RELEASE`\";" > $@ @@\
> > @@\ +includes:: release.h
> > @@\ +
> > @@\ depend:: release.h
> > @@\ @@\ clean::
> > @@\
>
> I can't see why Solaris 10 would need the release.h at the includes stage
> rather than the depend stage when other systems, including Solaris 9 are fine
> as it is. Please elaborate on the actual failure.
when i do a bmake configure in audio/nas i got (i remove unecessary part):
...
===> Creating toolchain wrappers for nas-1.7bnb1
===> Configuring for nas-1.7bnb1
mv -f Makefile Makefile.bak
imake -DUseInstalled -I/usr/pkg/lib/X11/config -I/usr/openwin/lib/X11/config
make Makefiles
making Makefiles in include...
mv Makefile Makefile.bak
...
+ ln -s ../../lib/audio/mutex.h .
+ rm -f release.h
+ ln -s ../../lib/audio/release.h .
including in ./clients...
...
+ ln -s ..//config/config.h .
make depend
depending in ./include...
depending in include/audio...
depending in ./server...
depending in server/dia...
/usr/ccs/bin/yacc -d gram.y
mv y.tab.c gram.c
mv y.tab.h gram.h
rm -f lex.c
/usr/ccs/bin/lex -t lex.l > lex.c
makedepend -- -I. -I../include -I../../include -I../../lib/audio
-I../../include -I/usr/pkg/include -Dsun -Di386 -DSVR4 -DSYSV
-DNASCONFSEARCHPATH=\"/usr/pkg/etc/nas/\" -- dispatch.c dixutils.c events.c
globals.c main.c resource.c swapreq.c tables.c swaprep.c audispatch.c auswap.c
autables.c auevents.c auutil.c auconfig.c auprocess.c nasconf.c lex.c gram.c
depending in server/os...
makedepend -- -I. -I../include -I../../include -I../../include
-I/usr/pkg/include -Dsun -Di386 -DSVR4 -DSYSV -DTCPCONN -DUNIXCONN
-DNDBM -- WaitFor.c access.c connection.c io.c osinit.c utils.c auth.c
mitauth.c aulog.c daemon.c
makedepend: warning: utils.c, line 58: cannot find include file
"audio/release.h"
not in audio/release.h
not in audio/release.h
not in ./audio/release.h
not in ../include/audio/release.h
not in ../../include/audio/release.h
not in ../../include/audio/release.h
not in /usr/pkg/include/audio/release.h
not in /usr/include/audio/release.h
makedepend: warning: aulog.c: 150: #error("Unrecognized compiler protocol for
variable argument lists")
depending in server/dda/sun...
...
at this stage include/audio/release.h does not exist.
I include my wished patch for solaris10 x86 gcc
Gilles
>
> cheers
> mark
>
--Swarm_of_Insects_275_000
Content-Type: TEXT/plain; name=patch-ab; charset=us-ascii; x-unix-mode=0644
Content-Description: patch-ab
Content-MD5: b/NdPkIBIATvO83vFa57ag==
--- server/Imakefile.orig Sat Jun 4 06:40:58 2005
+++ server/Imakefile Thu Sep 1 17:24:42 2005
@@ -61,7 +61,7 @@
#endif
#ifdef NetBSDArchitecture
- SYSLIBS = -lossaudio
+ SYSLIBS = $(LIBOSSAUDIO)
#endif
CBRT =
@@ -96,7 +96,7 @@
#endif
-#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
+#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
# define CanBuildAuServer YES
# if defined(cygwinArchitecture)
@@ -213,14 +213,19 @@
$(RM) $(ALL)
ETCDIR = NasConfigSearchPath
+ EGDIR = ${PREFIX}/share/examples/nas
InstallManPage(nasd,$(MANDIR))
#ifdef InstallGenManPage
InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
#else
+#ifdef InstallNamedTarget
+InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX))
+#else
InstallManPage(nasd.conf,$(FILEMANDIR))
#endif
-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
+#endif
+InstallNonExecFile(nasd.conf.eg,$(EGDIR))
#else /* CanBuildAuServer */
--Swarm_of_Insects_275_000
Content-Type: TEXT/plain; name=patch-ag; charset=us-ascii; x-unix-mode=0644
Content-Description: patch-ag
Content-MD5: ifjMmzPqquUi6xSyGj9ZZg==
--- lib/audio/Imakefile.orig Sat Jun 4 22:08:54 2005
+++ lib/audio/Imakefile Thu Sep 1 15:48:25 2005
@@ -25,6 +25,10 @@
#include "../../config/NetAudio.tmpl"
+#define ProjectThreadsDefines -DXTHREADS -threads
+#define ThreadsCompileFlags -threads
+#define ThreadsCplusplusCompileFlags -threads
+
#include <Threads.tmpl>
#if ProjectX < 5
@@ -50,10 +54,17 @@
#define DoDebugLib DebugLibAudio
#define DoProfileLib ProfileLibAudio
+/* #define ProjectThreadsDefines -DXTHREADS -threads */
+/* #define ThreadsCompileFlags -threads */
+/* #define ThreadsCplusplusCompileFlags -threads */
/* must include <Library.tmpl> *after* the above 4 lines */
#include <Library.tmpl>
+/* #define ProjectThreadsDefines -DXTHREADS -threads */
+/* #define ThreadsCompileFlags -threads */
+/* #define ThreadsCplusplusCompileFlags -threads */
+
#if SystemV && !SystemV4 && !defined(XFree86Version) && !defined(AIXArchitecture)
SYSV_DEFINES = -DAU_NOT_STDC_ENV -D_AuNEEDBCOPYFUNC -DNEED_FAKE_XWIN
#endif
--Swarm_of_Insects_275_000
Content-Type: TEXT/plain; name=patch-ah; charset=us-ascii; x-unix-mode=0644
Content-Description: patch-ah
Content-MD5: ui3rBrBYYGlvfHyOry09uw==
--- config/NetAudio.tmpl.orig Sun Feb 15 00:38:32 2004
+++ config/NetAudio.tmpl Thu Nov 17 15:09:16 2005
@@ -287,6 +287,8 @@
release.h: $(TOP)/RELEASE @@\
@echo "static char *release = \"@(#)`cat $(TOP)/RELEASE`\";" > $@ @@\
@@\
+includes:: release.h @@\
+ @@\
depend:: release.h @@\
@@\
clean:: @@\
--Swarm_of_Insects_275_000--