On Sun, 23 Sep 2007 13:56:24 +0200 Frank Lichtenheld <[EMAIL PROTECTED]> wrote:
> On Tue, Aug 28, 2007 at 09:39:40PM +0100, Neil Williams wrote: > > The /usr/share/dpkg-cross/buildcross file is part of dpkg-cross 1.99 > > +2.0.0pre2 which is due to be uploaded to experimental just after pre1 > > leaves NEW. > [...] > > --- dpkg.old/scripts/dpkg-buildpackage.sh 2007-08-27 23:23:28.000000000 > > +0100 > > +++ dpkg-1.14.5/scripts/dpkg-buildpackage.sh 2007-08-28 > > 20:06:39.000000000 +0100 > > @@ -84,6 +84,18 @@ > > passopts='' > > admindir='' > > > > +DPKGCROSSENABLE=0 > > +if [ -f /usr/share/dpkg-cross/buildcross ]; then > > + . /usr/share/dpkg-cross/buildcross > > + DPKGCROSSENABLE=1 > > +fi > > + > > +function enhance_cross { > > + if [ $DPKGCROSSENABLE -gt 0 ]; then > > + setup_cross > > + fi > > +} > > + > > Just to make your life harder ;) I've now decided to convert > dpkg-buildpackage to a Perl script (see head of master branch > in git). Therefor this part of the patch doesn't apply anymore. It isn't a problem - this is a workaround patch. Guillem doesn't want the external lookup involved in the workaround, he wants an internal solution. The perl version simply needs to implement the functionality of setup_cross which, in turn, needs to setup and use a directory of symlinks that are only in the PATH when cross-compiling and which allow the command line paths passed to the cross-compiler to be manipulated in real time to set the actual location of the cross header and -dev package contents. $args =~ s,/usr/include/,/usr/$arch_type/include/; where $arch_type is "arm-linux-gnu", for example, retrieved from dpkg-architecture (which in turn is set by the -a switch). That functionality is available as gccross in the dpkg-cross source at the moment and could be implemented that way in dpkg - dpkg-buildpackage just needs to setup the PATH to put the directory containing gccross first. http://alioth.debian.org/plugins/scmcvs/cvsweb.php/dpkg-cross/buildcross?rev=1.1;content-type=text%2Fplain;cvsroot=dpkg-cross -- Neil Williams ============= http://www.data-freedom.org/ http://www.nosoftwarepatents.com/ http://www.linux.codehelp.co.uk/
pgppt6qynGcrY.pgp
Description: PGP signature