Re: Conditionally applying an architecture-dependent patch

2006-11-30 Thread Russ Allbery
Goswin von Brederlow <[EMAIL PROTECTED]> writes: > That isn't very flexible. > By using cpp I can use #include recursively and at any point of the > series. I can also use #ifdef or any other cpp construct. I can insert > an architecture specific patch by enclosing it in #ifdef __arch__. If > I c

Re: Conditionally applying an architecture-dependent patch

2006-11-30 Thread Goswin von Brederlow
Russ Allbery <[EMAIL PROTECTED]> writes: > Goswin von Brederlow <[EMAIL PROTECTED]> writes: > >> I need exactly the same thing. I was lloking for an include statement >> for series files though. Something like > >> debian/patches/series.common: >> version.patch >> foo.patch >> barf.patch > >> debi

Re: Conditionally applying an architecture-dependent patch

2006-11-29 Thread Russ Allbery
Goswin von Brederlow <[EMAIL PROTECTED]> writes: > I need exactly the same thing. I was lloking for an include statement > for series files though. Something like > debian/patches/series.common: > version.patch > foo.patch > barf.patch > debian/patches/series.amd64: > #include "series.common" >

Re: Conditionally applying an architecture-dependent patch

2006-11-29 Thread Michael Banck
On Tue, Nov 28, 2006 at 05:00:41PM +0100, Goswin von Brederlow wrote: > Quilt does not seem to have this. But it shouldn't be hard to write a > makefile target that creates the series file by running > debian/patches/series.$ARCH through cpp. That is the way I'm going > anyway, hence the syntax. B

Re: Conditionally applying an architecture-dependent patch

2006-11-28 Thread Shaun Jackman
On 11/28/06, Loïc Minier <[EMAIL PROTECTED]> wrote: If you use simple-patchsys, you can prepend before any "include" line: ifeq ($(DEB_HOST_ARCH),m68k) DEB_PATCHDIRS = debian/patches debian/patches/$(DEB_HOST_ARCH) endif to add debian/patches/m68k to the list of directories with patches t

Re: Conditionally applying an architecture-dependent patch

2006-11-28 Thread Ian Campbell
On Mon, 2006-11-27 at 16:04 -0800, Steve Langasek wrote: > I would normally recommend quilt, but I'm not sure it has a concept of > conditional patches, which may make things awkward later if further > patches are required. I've never used it but I think that what the "guards" feature of quilt 0.

Re: Conditionally applying an architecture-dependent patch

2006-11-28 Thread Goswin von Brederlow
Pierre Habouzit <[EMAIL PROTECTED]> writes: > On Mon, Nov 27, 2006 at 07:21:53PM -0500, Daniel Jacobowitz wrote: >> On Mon, Nov 27, 2006 at 04:04:41PM -0800, Steve Langasek wrote: >> > I would normally recommend quilt, but I'm not sure it has a concept of >> > conditional patches, which may make t

Re: Conditionally applying an architecture-dependent patch

2006-11-28 Thread Pierre Habouzit
On Mon, Nov 27, 2006 at 07:21:53PM -0500, Daniel Jacobowitz wrote: > On Mon, Nov 27, 2006 at 04:04:41PM -0800, Steve Langasek wrote: > > I would normally recommend quilt, but I'm not sure it has a concept of > > conditional patches, which may make things awkward later if further patches > > are req

Re: Conditionally applying an architecture-dependent patch

2006-11-28 Thread Loïc Minier
On Mon, Nov 27, 2006, Shaun Jackman wrote: > When using CDBS, what is the best way to conditionally apply an > architecture-dependent patch. I'm using CDBS, but not yet using a > patch system such as simple-patchsys, dpatch, or quilt, so > recommendations of a patch system are welcome. Currently I

Re: Conditionally applying an architecture-dependent patch

2006-11-27 Thread Benjamin Seidenberg
Shaun Jackman wrote: > When using CDBS, what is the best way to conditionally apply an > architecture-dependent patch. I'm using CDBS, but not yet using a > patch system such as simple-patchsys, dpatch, or quilt, so > recommendations of a patch system are welcome. Currently I have... > > ARCH64 :=

Re: Conditionally applying an architecture-dependent patch

2006-11-27 Thread Steinar H. Gunderson
On Mon, Nov 27, 2006 at 04:04:41PM -0800, Steve Langasek wrote: > No, it's a broken package. He's referring to swt-gtk, whose source includes > assumptions that will necessarily break on either 32-bit or 64-bit > architectures unless a fix-up is applied. #if __BITS_PER_LONG == 64? or #if defined

Re: Conditionally applying an architecture-dependent patch

2006-11-27 Thread Daniel Jacobowitz
On Mon, Nov 27, 2006 at 04:04:41PM -0800, Steve Langasek wrote: > I would normally recommend quilt, but I'm not sure it has a concept of > conditional patches, which may make things awkward later if further patches > are required. It doesn't. I think I've seen this done before by processing the s

Re: Conditionally applying an architecture-dependent patch

2006-11-27 Thread Steve Langasek
On Mon, Nov 27, 2006 at 11:31:52PM +0100, Hendrik Sattler wrote: > Am Montag 27 November 2006 22:46 schrieb Shaun Jackman: > > When using CDBS, what is the best way to conditionally apply an > > architecture-dependent patch. I'm using CDBS, but not yet using a > > patch system such as simple-patchs

Re: Conditionally applying an architecture-dependent patch

2006-11-27 Thread Hendrik Sattler
Am Montag 27 November 2006 22:46 schrieb Shaun Jackman: > When using CDBS, what is the best way to conditionally apply an > architecture-dependent patch. I'm using CDBS, but not yet using a > patch system such as simple-patchsys, dpatch, or quilt, so > recommendations of a patch system are welcome.

Conditionally applying an architecture-dependent patch

2006-11-27 Thread Shaun Jackman
When using CDBS, what is the best way to conditionally apply an architecture-dependent patch. I'm using CDBS, but not yet using a patch system such as simple-patchsys, dpatch, or quilt, so recommendations of a patch system are welcome. Currently I have... ARCH64 := alpha amd64 ia64 ifneq (,$(fil