diff options
| author | Cyril Romain <cyril.romain@gmail.com> | 2007-03-21 19:02:10 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2007-03-21 19:02:10 +0000 |
| commit | af45ae1d6cde2a37bff09038a74b3f4a9e954980 (patch) | |
| tree | 04db5f517ef99c525f7dc5da1d01dcaca37f4263 /packages | |
| parent | 111e45dcbab34e3c969528924931498a4e989a87 (diff) | |
prismstumbler: bug #1679, fix inclusion of host headers and incorrect ranlib and ar calls, thanks to Cyril Romain
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch | 26 | ||||
| -rw-r--r-- | packages/prismstumbler/prismstumbler_0.7.3.bb | 12 |
2 files changed, 9 insertions, 29 deletions
diff --git a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch b/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch deleted file mode 100644 index 9aef61e9d3..0000000000 --- a/packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- prismstumbler-0.7.3/src/gpsd/Makefile.in~fix-includes -+++ prismstumbler-0.7.3/src/gpsd/Makefile.in -@@ -92,18 +92,6 @@ - COMPILE_AND_LINK.c = \ - $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS) - --## Where to look for X include files. (-I/usr/X11R5/include) --X_INCLUDE = @X_CFLAGS@ -- --## Where to look for include files. --INCLUDE = -I. $(X_INCLUDE) -- --## Implicit rules. --.SUFFIXES: .c --.c.o: -- $(COMPILE.c) $(INCLUDE) -o $@ $< -- -- - ## Libraries and object files - LIB_OBJECTS = netlib.o nmea_parse.o serial.o tm.o em.o $(MOTIF_OBJECTS) - diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 8699e5668b..bf38d10ca1 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r4" +PR = "r5" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -9,12 +9,18 @@ RDEPENDS = "wireless-tools" SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \ file://bogoconf.patch;patch=1 \ - file://fix-includes.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ file://libz.patch;patch=1;pnum=0" inherit autotools pkgconfig -EXTRA_OECONF = "--with-libpcap=${STAGING_DIR}/${HOST_SYS} --with-sqlite-libs=${STAGING_LIBDIR} --with-sqlite-includes=${STAGING_INCDIR}" +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-sqlite-includes=${STAGING_INCDIR} \ + --with-sqlite-libs=${STAGING_LIBDIR} \ + --without-athena" + CFLAGS =+ "-I${S}/include -D_GNU_SOURCE" FILES_${PN} = "${bindir}/prismstumbler" |