[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: porters wanted: xprint-xprintorg



On Mon, Feb 07, 2005 at 06:31:41PM +0100, Michael Banck wrote:
> Hi,

Hi Michael,

> 
> xprt-xprintorg seems to be the last package missing from the
> x-window-system meta-package (at least, after taking a casual look, I
> could be wrong), so it would be nice to have it ported.
> 
> I just tried to build it, and there are issues with the contained
> config/cf/gnu.cf:
> 
> [...]
> ./config/imake/imake -I./config/cf  -s
> ./config/makedepend/Makefile.proto -f ./config/makedepend/Imakefile
> 	 -DTOPDIR=../.. -DCURDIR=./config/makedepend
> In file included from config/cf/Imake.tmpl:109,
>                  from Imakefile.c:14:
> config/cf/gnu.cf:55: warning: "HasShm" redefined
> In file included from config/cf/host.def:3,
>                  from config/cf/site.def:44,
>                  from config/cf/Imake.tmpl:46,
>                  from Imakefile.c:14:
> config/cf/xprint_host.def:119: warning: this is the location of the previous definition
> In file included from config/cf/Imake.tmpl:109,
>                  from Imakefile.c:14:
> config/cf/gnu.cf:108: no macro name given in #ifndef directive
> ./config/imake/imake: Exit code 1.
>   Stop.
> make[2]: *** [config/makedepend/Makefile.proto] Error 1
> make[2]: Leaving directory
> 	`/home/mbanck/tmp/tmp/xprint-xprintorg-0.1.0.alpha1/build-tree/xc'
> make[1]: *** [World] Error 2
> 
> The full log is at
> http://people.debian.org/~mbanck/xprint-xprintorg_0.1.0.alpha1-8_20050207-1740
> 
> It might be that the provided gnu.cf is out of sync with the one in the
> xfree86 source package. So the first thing should be to check both and
> change this one apropriately.

I looked the file gnu.cf and it really looks weird at these 2
locations:
* The first (HasShm) is explicitely marked as broken
* The second is clearly missing something after the #ifdef

I applied the (trivial) attached patch and the packaged build
successfully.

Can you please review it ? I'm not a xfree86 guru.

Hope it helps !

Pierre.
--- gnu.cf.saved	2005-02-07 22:28:37.000000000 +0100
+++ gnu.cf	2005-02-07 22:21:23.000000000 +0100
@@ -52,7 +52,9 @@
 #define HasPutenv		YES
 
 XCOMM Not implemented and will always fail.
-#define HasShm			YES
+#ifndef HasShm
+# define HasShm			YES
+#endif
 
 #define HasBSD44Sockets		YES
 #define HasSockets		YES
@@ -105,7 +107,7 @@
 #ifndef DoLoadableServer
 #define DoLoadableServer	YES
 #endif
-#ifndef
+#ifndef CppCmd
 #define CppCmd			/lib/cpp
 #endif
 #define YaccCmd			bison -y

Reply to: