On Fri, Feb 16, 2007 at 21:51:54 -0500, David Nusinow wrote:
> On Thu, Feb 15, 2007 at 12:13:22PM +0100, Michel Dänzer wrote:
> > On Thu, 2007-02-15 at 05:26 +0100, Julien Cristau wrote:
> > >
> > > +SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver || true)
> > > +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
> >
> > What's the || true for? Looks like SERVER_DEPENDS relies on the file
> > being there anyway.
>
> Right, I think that this should fail to build if the file isn't present.
>
done that now
> > > This means that drivers need to set the PACKAGE variable in
> > > debian/rules
> > > before including xsfbs.mk,
> >
> > Maybe the package name could be derived from the build directory name if
> > this isn't set explicitly? Not a big deal I guess.
>
> We could also make the assumption that the first package listed in
> debian/control is the package name. I think debhelper makes that assumption
> in a few places also, so it wouldn't really be novel. Adding an explicit
> variable is totally fine by me too, and would probably be more transparent
> if slightly more tedious.
>
the new version of the patch uses the first binary package listed in
debian/control, if $(PACKAGE) is not defined.
From c6be0fed42ca56370d6ee2d4a6c27f0c7a433bca Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sat, 17 Feb 2007 16:00:06 +0100
Subject: [PATCH] Add new "serverabi" rule to generate drivers dependency on the server.
---
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..43e9e41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+ @echo error: xserver-xorg-dev needs to be installed
+ @exit 1
+else
+ echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+endif
+
include debian/xsfbs/xsfbs-autoreconf.mk
# vim:set noet ai sts=8 sw=8 tw=0:
--
1.4.4.4
Attachment:
signature.asc
Description: Digital signature