From owner-freebsd-current@FreeBSD.ORG Thu Mar 12 14:39:16 2009 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79923106567B; Thu, 12 Mar 2009 14:39:16 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (brucec-1-pt.tunnel.tserv4.nyc4.ipv6.he.net [IPv6:2001:470:1f06:c09::2]) by mx1.freebsd.org (Postfix) with ESMTP id 2141C8FC1F; Thu, 12 Mar 2009 14:39:16 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id B7A421924B; Thu, 12 Mar 2009 14:39:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on muon X-Spam-Level: X-Spam-Status: No, score=-2.4 required=8.0 tests=AWL,BAYES_00,NO_RELAYS autolearn=ham version=3.2.5 Received: from gluon (unknown [IPv6:2a01:348:10f:0:240:f4ff:fe57:9871]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA; Thu, 12 Mar 2009 14:39:14 +0000 (GMT) Date: Thu, 12 Mar 2009 14:39:11 +0000 From: Bruce Cran To: Boris Samorodov Message-ID: <20090312143911.653c3f72@gluon> In-Reply-To: <68384190@bb.ipt.ru> References: <11273764@bb.ipt.ru> <20090312133915.548350e4@gluon> <68384190@bb.ipt.ru> X-Mailer: Claws Mail 3.6.1 (GTK+ 2.15.5; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: pav@FreeBSD.org, freebsd-current@FreeBSD.org Subject: Re: libusb and fast current changes X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 14:39:17 -0000 On Thu, 12 Mar 2009 17:29:21 +0300 Boris Samorodov wrote: > On Thu, 12 Mar 2009 13:39:15 +0000 Bruce Cran wrote: > > On Thu, 12 Mar 2009 13:17:31 +0300 > > Boris Samorodov wrote: >=20 > > > I use ports-mgmt/tinderbox to test changes to ports. I'd got > > > at trouble with graphics/libgphoto2: > > > ----- > > > gmake[4]: Entering directory > > > `/work/a/ports/graphics/libgphoto2/work/libgphoto2-2.4.4/libgphoto2_p= ort/usb' /bin/sh /work/a/ports/graphics/libgphoto2/work/gnome-libtool > > > --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H -I. -I.. -I.. > > > -DLOCALEDIR=3D\"/usr/local/share/locale\" > > > -DIOLIBS=3D\"/usr/local/lib/libgphoto2_port/0.8.0\" > > > -I/usr/local/include -Wall -Wmissing-declarations > > > -Wmissing-prototypes -g -D_GPHOTO2_INTERNAL_CODE > > > -I/usr/local/include -I/usr/include -I/usr/local/include -O2 > > > -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT > > > usb_la-libusb.lo -MD -MP -MF .deps/usb_la-libusb.Tpo -c -o > > > usb_la-libusb.lo `test -f 'libusb.c' || echo './'`libusb.c > > > mkdir .libs cc -DHAVE_CONFIG_H -I. -I.. -I.. > > > -DLOCALEDIR=3D\"/usr/local/share/locale\" > > > -DIOLIBS=3D\"/usr/local/lib/libgphoto2_port/0.8.0\" > > > -I/usr/local/include -Wall -Wmissing-declarations > > > -Wmissing-prototypes -g -D_GPHOTO2_INTERNAL_CODE > > > -I/usr/local/include -I/usr/include -I/usr/local/include -O2 > > > -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -MT > > > usb_la-libusb.lo -MD -MP -MF .deps/usb_la-libusb.Tpo -c libusb.c > > > -fPIC -DPIC -o .libs/usb_la-libusb.o libusb.c:37:31: error: > > > libusb20_compat10.h: No such file or directory libusb.c: In > > > function 'gp_port_usb_open': libusb.c:230: warning: unused > > > variable 'name' gmake[4]: *** [usb_la-libusb.lo] Error 1 > > > gmake[4]: Leaving directory > > > `/work/a/ports/graphics/libgphoto2/work/libgphoto2-2.4.4/libgphoto2_p= ort/usb' > > > gmake[3]: *** [all-recursive] Error 1 ----- > > >=20 > > > The jail system uses OSVERSION=3D800070 and really doesn't have > > > libusb20_compat10.h: > > > ----- > > > % cd /m/local/tinderbox/8-bsam-exp/usr/include=20 > > > % find . -name libusb\* > > > ./libusb20.h > > > ./libusb20_desc.h > > > ----- > > >=20 > > > However the host system has that file. But it's rather stale file > > > from one of previous installworlds (the one that had happened at > > > Dec 1, 2008): ----- > > > % sysctl kern.osreldate > > > kern.osreldate: 800070 > > > % (cd /usr/include && ls -l `find . -name libusb\*`) > > > -r--r--r-- 1 root wheel 11680 12 =D0=BC=D0=B0=D1=80 12:19 ./libusb= 20.h > > > -r--r--r-- 1 root wheel 9511 1 =D0=B4=D0=B5=D0=BA > > > 19:58 ./libusb20_compat01.h -r--r--r-- 1 root wheel 1451 1 > > > =D0=B4=D0=B5=D0=BA 19:58 ./libusb20_compat10.h -r--r--r-- 1 root wh= eel 15969 > > > 12 =D0=BC=D0=B0=D1=80 12:19 ./libusb20_desc.h ----- > > >=20 > > > Both the host and the tinderbox jail were rebuilt/reinstalled two > > > hours ago. Pav@ at private email said that he had been told this > > > file should exit. > > >=20 > > > Help! >=20 > > Lots of changes were made a couple of days ago to the > > installation of libusb[20]: libusb20 is now installed as libusb, and > > libusb20_compat01.h was renamed to usb.h to be compatible with > > libusb-0.1. So for example any patches which change to > > can be removed. >=20 > Wow! Bruce, that was a nice shot. You definitely undertand what's > going on here. Thanks! >=20 > Pav, can you test the attached patch? It work for the latest > i386/amd64 CURRENT for me. >=20 >=20 > WBR You may find you're repeating work that's already been done: http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/libgphoto2/ shows libgphoto2 was updated a few days ago to fix the build problems introduced with the renaming.=20 --=20 Bruce