Re: libusb and fast current changes

On Thu, 12 Mar 2009 13:39:15 +0000 Bruce Cran wrote:
> On Thu, 12 Mar 2009 13:17:31 +0300
> Boris Samorodov <bsam_at_ipt.ru> wrote:

> > 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_port/usb' /bin/sh /work/a/ports/graphics/libgphoto2/work/gnome-libtool
> > --tag=CC   --mode=compile cc -DHAVE_CONFIG_H -I. -I..  -I..
> > -DLOCALEDIR=\"/usr/local/share/locale\"
> > -DIOLIBS=\"/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=\"/usr/local/share/locale\"
> > -DIOLIBS=\"/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_port/usb'
> > gmake[3]: *** [all-recursive] Error 1 -----
> > 
> > The jail system uses OSVERSION=800070 and really doesn't have
> > libusb20_compat10.h:
> > -----
> > % cd /m/local/tinderbox/8-bsam-exp/usr/include 
> > % find . -name libusb\*
> > ./libusb20.h
> > ./libusb20_desc.h
> > -----
> > 
> > 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 мар 12:19 ./libusb20.h
> > -r--r--r--  1 root  wheel   9511  1 дек 19:58 ./libusb20_compat01.h
> > -r--r--r--  1 root  wheel   1451  1 дек 19:58 ./libusb20_compat10.h
> > -r--r--r--  1 root  wheel  15969 12 мар 12:19 ./libusb20_desc.h
> > -----
> > 
> > Both the host and the tinderbox jail were rebuilt/reinstalled two
> > hours ago. Pav_at_ at private email said that he had been told this file
> > should exit.
> > 
> > Help!

> 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 <usb.h> to
> <libusb20_compat01.h> can be removed.

Wow! Bruce, that was a nice shot. You definitely undertand what's
going on here. Thanks!

Pav, can you test the attached patch? It work for the latest
i386/amd64 CURRENT for me.


WBR
-- 
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve