[oe-commits] org.oe.dev merge of '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Nov 15 19:47:55 UTC 2007
merge of '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
and '7f5c53f2fa166aff72aba4062607f641a2050e32'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335
ViewMTN: http://monotone.openembedded.org/revision/info/33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335
Files:
1
packages/navit/navit_cvs.bb
packages/ettercap/ettercap-0.6.b
packages/ettercap/ettercap-0.6.b/configure.patch
packages/ettercap/ettercap_0.6.b.bb
packages/ettercap/files
packages/sqlite/sqlite3
packages/ettercap/ettercap-ng_0.7.3.bb
packages/ettercap/files/autotools.patch
packages/glibc/glibc-intermediate_2.7.bb
packages/sqlite/sqlite3/cross-compile.patch
packages/sqlite/sqlite3/ldflags.patch
packages/sqlite/sqlite3/libtool.patch
packages/sqlite/sqlite3_3.5.2.bb
contrib/feed-browser/includes/config.inc
packages/base-files/base-files/akita/fstab
packages/base-files/base-files/c7x0/fstab
packages/base-files/base-files/collie/fstab
packages/base-files/base-files/poodle/fstab
packages/base-files/base-files/spitz/fstab
packages/base-files/base-files/tosa/fstab
packages/base-files/base-files_3.0.14.bb
Diffs:
#
# mt diff -r041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8 -r33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335
#
#
#
# patch "packages/navit/navit_cvs.bb"
# from [45f78eea6f26041db46347891bf6cfad062b1b81]
# to [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
#
============================================================
--- packages/navit/navit_cvs.bb 45f78eea6f26041db46347891bf6cfad062b1b81
+++ packages/navit/navit_cvs.bb bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9
@@ -8,7 +8,6 @@ SRC_URI = "cvs://anonymous@navit.cvs.sou
S = "${WORKDIR}/navit"
SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-# file://compile-fix.patch;patch=1"
"
EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
#
# mt diff -r7f5c53f2fa166aff72aba4062607f641a2050e32 -r33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335
#
#
#
# delete "packages/ettercap/ettercap-0.6.b"
#
# delete "packages/ettercap/ettercap-0.6.b/configure.patch"
#
# delete "packages/ettercap/ettercap_0.6.b.bb"
#
# add_dir "packages/ettercap/files"
#
# add_dir "packages/sqlite/sqlite3"
#
# add_file "packages/ettercap/ettercap-ng_0.7.3.bb"
# content [885933dadc1db669a1e36edfed1a6651b48a0aae]
#
# add_file "packages/ettercap/files/autotools.patch"
# content [a46938ba70c1204f0430b669e940422dcf404f4e]
#
# add_file "packages/glibc/glibc-intermediate_2.7.bb"
# content [27e617506e71e32db940d64c4849ce48bcfeb8b4]
#
# add_file "packages/sqlite/sqlite3/cross-compile.patch"
# content [042a61e637b0dbcec6e33369da0d1d863518934c]
#
# add_file "packages/sqlite/sqlite3/ldflags.patch"
# content [f72a79539a6af7dc9d3729e7bfa96b305faf8169]
#
# add_file "packages/sqlite/sqlite3/libtool.patch"
# content [9301b88cfee311e677873cae9b461f3fc90eb8a8]
#
# add_file "packages/sqlite/sqlite3_3.5.2.bb"
# content [0edb125c6ed5c435fe50102b3d355f2b8061b1ef]
#
# patch "contrib/feed-browser/includes/config.inc"
# from [9bcb9f854ff6728529de402c08d7094a7ca86dd5]
# to [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
#
# patch "packages/base-files/base-files/akita/fstab"
# from [051fdab814430f401dc16286d1b777bc35162b34]
# to [855484ea65b3d49701e574e221d3465069d37a0e]
#
# patch "packages/base-files/base-files/c7x0/fstab"
# from [eed9bc8456143ce5a434151621475fb86deb06ac]
# to [04cc26eb17a1dc0d9f40acf54504ae3438ad60c5]
#
# patch "packages/base-files/base-files/collie/fstab"
# from [05311cfbc2a0c4d6c46a9fd4069350acd0e738af]
# to [d021297a86dede194f58f281f05215ada358a38b]
#
# patch "packages/base-files/base-files/poodle/fstab"
# from [073a091164137a993354145d11ab8fec7d5d705e]
# to [68f3d377a9ee2c1310021b9097f1937f7e5ac18b]
#
# patch "packages/base-files/base-files/spitz/fstab"
# from [35ab9eb73d1459c8df77b39504039919fed923f8]
# to [e2d7a6cfe5868408dac45ab759d61f4463307ac0]
#
# patch "packages/base-files/base-files/tosa/fstab"
# from [6437623746ef3ac7b1c5885e9b3b1d769225f2e1]
# to [631ad0716796432fa213c13cdbc22b739968800b]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [5ad0ff2fa42f3bbdf7ceaf70ccf5f97af9120efa]
# to [56808741a8321e9f358d766697b017963b7292b4]
#
============================================================
--- packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
+++ packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
@@ -0,0 +1,18 @@
+DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \
+supports active and passive dissection of many protocols (even ciphered ones, \
+like SSH and HTTPS)."
+SECTION = "console/network"
+DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
+ file://autotools.patch;patch=1"
+
+S = "${WORKDIR}/ettercap-NG-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "--disable-gtk"
+
+FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so"
+FILES_${PN}-dbg += "${libdir}/ettercap/.debug"
============================================================
--- packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
+++ packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
@@ -0,0 +1,173 @@
+diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in
+--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100
++++ ettercap-NG-0.7.3-changed/configure.in 2007-11-07 11:42:25.000000000 +0100
+@@ -178,6 +178,7 @@
+
+ AC_PROG_CC
+ AM_PROG_CC_STDC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_GCC_TRADITIONAL
+@@ -236,7 +237,7 @@
+ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h)
+ AC_CHECK_HEADERS(sys/cdefs.h)
+ dnl nameser NS_GET32 and so on...
+-EC_NS_GET()
++dnl EC_NS_GET()
+
+ dnl ==================================================================
+ dnl Checks for typedefs, structures, and compiler characteristics.
+@@ -379,129 +380,6 @@
+ dnl ==================
+
+
+-dnl ---------
+-dnl libpcap
+-dnl ---------
+-ac_ec_libpcap=default
+-
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR),
+-[ case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"])
+- ;;
+- *)
+- if test -f $withval/pcap.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- PCAPINC="-I$withval"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-L$withval -lwpcap -lpacket"
+- else
+- PCAPLIB="-L$withval -lpcap"
+- fi
+- ac_ec_libpcap=$withval
+- AC_MSG_RESULT($withval)
+- elif test -f $withval/include/pcap.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- PCAPINC="-I$withval/include"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-L$withval/lib -lwpcap -lpacket"
+- else
+- PCAPLIB="-L$withval/lib -lpcap"
+- fi
+- ac_ec_libpcap=$withval
+- AC_MSG_RESULT($withval)
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([pcap.h not found in $withval])
+- fi
+- ;;
+- esac ],
+-[ if test -f /usr/include/pcap/pcap.h; then
+- PCAPINC="-I/usr/include/pcap"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- elif test -f /usr/include/pcap.h; then
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- elif test -f /usr/local/include/pcap.h; then
+- PCAPINC="-I/usr/local/include"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libpcap not found])
+- fi
+- AC_MSG_RESULT(yes) ]
+-)
+-
+-if test "$OS" = "WINDOWS"; then
+- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
+- AC_CHECK_LIB(iphlpapi, main)
+-else
+- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-fi
+-
+-dnl ---------
+-dnl libnet
+-dnl ---------
+-ac_ec_libnet=default
+-
+-AC_MSG_CHECKING(for libnet)
+-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR),
+-[ case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"])
+- ;;
+- *)
+- if test -f $withval/lnet.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNETINC="-I$withval"
+- LNETLIB="-L$withval -lnet"
+- ac_ec_libnet=$withval
+- AC_MSG_RESULT($withval)
+- elif test -f $withval/include/libnet.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNETINC="-I$withval/include"
+- LNETLIB="-L$withval/lib -L$withval/src -lnet"
+- ac_ec_libnet=$withval
+- AC_MSG_RESULT($withval)
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libnet.h not found in $withval])
+- fi
+- ;;
+- esac ],
+-[ if test -f /usr/include/libnet.h; then
+- AC_MSG_RESULT(yes)
+- LNETINC=""
+- LNETLIB="-lnet"
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libnet >= 1.1.2.1 not found])
+- fi
+-]
+-)
+-
+-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
+-
+ dnl ------------------
+ dnl Checks for openssl
+ dnl ------------------
+@@ -794,7 +672,8 @@
+ dnl set up the final vars
+ dnl -----------------------
+ EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
+-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet"
+
+ AC_SUBST(EC_CFLAGS)
+ AC_SUBST(EC_LIBS)
+diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am
+--- ettercap-NG-0.7.3/src/Makefile.am 2005-01-13 10:18:48.000000000 +0100
++++ ettercap-NG-0.7.3-changed/src/Makefile.am 2007-11-06 20:15:12.000000000 +0100
+@@ -127,8 +127,7 @@
+
+ ettercap_CFLAGS = @EC_CFLAGS@
+
+-ettercap_LDADD = @LIBOBJS@ \
+- os/libec_os.a \
++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \
+ interfaces/daemon/libec_daemon.a \
+ interfaces/text/libec_text.a
+
============================================================
--- packages/glibc/glibc-intermediate_2.7.bb 27e617506e71e32db940d64c4849ce48bcfeb8b4
+++ packages/glibc/glibc-intermediate_2.7.bb 27e617506e71e32db940d64c4849ce48bcfeb8b4
@@ -0,0 +1,8 @@
+require glibc_${PV}.bb
+require glibc-intermediate.inc
+
+# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
+do_configure_prepend() {
+ sed -i s:-Werror:: ${S}/configure
+}
+
============================================================
--- packages/sqlite/sqlite3/cross-compile.patch 042a61e637b0dbcec6e33369da0d1d863518934c
+++ packages/sqlite/sqlite3/cross-compile.patch 042a61e637b0dbcec6e33369da0d1d863518934c
@@ -0,0 +1,92 @@
+--- sqlite-3.3.7/configure.ac.orig 2006-08-21 00:20:50.000000000 +0200
++++ sqlite-3.3.7/configure.ac 2006-08-21 00:22:35.000000000 +0200
+@@ -187,10 +187,11 @@
+ default_build_cflags="-g"
+ if test "$config_BUILD_CC" = ""; then
+ AC_PROG_CC
+- if test "$cross_compiling" = "yes"; then
+- AC_MSG_ERROR([unable to find a compiler for building build tools])
+- fi
+- BUILD_CC=$CC
++# if test "$cross_compiling" = "yes"; then
++# AC_MSG_ERROR([unable to find a compiler for building build tools])
++# fi
++# BUILD_CC=$CC
++BUILD_CC=gcc
+ default_build_cflags=$CFLAGS
+ else
+ BUILD_CC=$config_BUILD_CC
+@@ -238,6 +239,12 @@
+ TARGET_LINK=$config_TARGET_LINK
+ fi
+ AC_MSG_RESULT($TARGET_LINK)
++if test "$config_TARGET_LFLAGS" != ""; then
++ TARGET_LFLAGS=$config_TARGET_LFLAGS
++ else
++ TARGET_LFLAGS=$BUILD_LFLAGS
++ fi
++AC_MSG_RESULT($TARGET_LFLAGS)
+ AC_MSG_CHECKING([switches on the target compiler])
+ if test "$config_TARGET_TFLAGS" != ""; then
+ TARGET_TFLAGS=$config_TARGET_TFLAGS
+@@ -592,15 +599,7 @@
+ # Figure out what C libraries are required to compile programs
+ # that use "readline()" library.
+ #
+-if test "$config_TARGET_READLINE_LIBS" != ""; then
+- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
+-else
+- CC=$TARGET_CC
+- LIBS=""
+- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
+- AC_CHECK_LIB([readline], [readline])
+- TARGET_READLINE_LIBS="$LIBS"
+-fi
++TARGET_READLINE_LIBS="-lreadline"
+ AC_SUBST(TARGET_READLINE_LIBS)
+
+ ##########
+@@ -615,41 +614,8 @@
+ ##########
+ # Figure out where to get the READLINE header files.
+ #
+-AC_MSG_CHECKING([readline header files])
+-found=no
+-if test "$config_TARGET_READLINE_INC" != ""; then
+- TARGET_READLINE_INC=$config_TARGET_READLINE_INC
+- found=yes
+-fi
+-if test "$found" = "yes"; then
+- AC_MSG_RESULT($TARGET_READLINE_INC)
+-else
+- AC_MSG_RESULT(not specified: still searching...)
+- AC_CHECK_HEADER(readline.h, [found=yes])
+-fi
+-if test "$found" = "no"; then
+- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
+- AC_CHECK_FILE($dir/include/readline.h, found=yes)
+- if test "$found" = "yes"; then
+- TARGET_READLINE_INC="-I$dir/include"
+- break
+- fi
+- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
+- if test "$found" = "yes"; then
+- TARGET_READLINE_INC="-I$dir/include/readline"
+- break
+- fi
+- done
+-fi
+-if test "$found" = "yes"; then
+- if test "$TARGET_READLINE_LIBS" = ""; then
+- TARGET_HAVE_READLINE=0
+- else
+- TARGET_HAVE_READLINE=1
+- fi
+-else
+- TARGET_HAVE_READLINE=0
+-fi
++TARGET_READLINE_INC=""
++TARGET_HAVE_READLINE=1
+ AC_SUBST(TARGET_READLINE_INC)
+ AC_SUBST(TARGET_HAVE_READLINE)
+
============================================================
--- packages/sqlite/sqlite3/ldflags.patch f72a79539a6af7dc9d3729e7bfa96b305faf8169
+++ packages/sqlite/sqlite3/ldflags.patch f72a79539a6af7dc9d3729e7bfa96b305faf8169
@@ -0,0 +1,67 @@
+--- sqlite-3.3.7/Makefile.in.orig 2006-08-20 23:05:36.000000000 +0200
++++ sqlite-3.3.7/Makefile.in 2006-08-20 23:42:49.000000000 +0200
+@@ -31,6 +31,10 @@
+ #
+ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
+
++# OE overrides
++#
++TARGET_LFLAGS = @TARGET_LFLAGS@
++
+ # Define -DNDEBUG to compile without debugging (i.e., for production usage)
+ # Omitting the define will cause extra debugging code to be inserted and
+ # includes extra comments when "EXPLAIN stmt" is used.
+@@ -257,17 +261,17 @@
+ | $(NAWK) '{print $$5,$$6}' >last_change
+
+ libsqlite3.la: $(LIBOBJ)
+- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+ $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
+- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ -rpath $(libdir)/sqlite \
+ -version-info "8:6:8"
+
+ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
+- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
+ -o $@ $(TOP)/src/shell.c libsqlite3.la \
+ $(LIBREADLINE) $(TLIBS)
+
+@@ -456,12 +460,12 @@
+
+ tclsqlite3: tclsqlite-shell.lo libsqlite3.la
+ $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
+- libsqlite3.la $(LIBTCL)
++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+ testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
+ $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
+ $(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
+- libsqlite3.la $(LIBTCL)
++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+
+ fulltest: testfixture$(TEXE) sqlite3$(TEXE)
+@@ -471,7 +475,7 @@
+ ./testfixture $(TOP)/test/quick.test
+
+ sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \
+- $(TESTSRC) $(TOP)/tool/spaceanal.tcl
++ $(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl
+ sed \
+ -e '/^#/d' \
+ -e 's,\\,\\\\,g' \
+@@ -481,7 +485,7 @@
+ $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
+ $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
+ -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
+- libtclsqlite3.la $(LIBTCL)
++ libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+
+ # Rules used to build documentation
+ #
============================================================
--- packages/sqlite/sqlite3/libtool.patch 9301b88cfee311e677873cae9b461f3fc90eb8a8
+++ packages/sqlite/sqlite3/libtool.patch 9301b88cfee311e677873cae9b461f3fc90eb8a8
@@ -0,0 +1,25 @@
+Index: sqlite-3.2.1/Makefile.in
+===================================================================
+--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100
++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200
+@@ -15,7 +15,10 @@
+ # The toplevel directory of the source tree. This is the directory
+ # that contains this "Makefile.in" and the "configure.in" script.
+ #
+-TOP = @srcdir@
++TOP = $(srcdir)
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = .
+
+ # C Compiler and options for use in building executables that
+ # will run on the platform that is doing the build.
+@@ -96,7 +99,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ INSTALL = @INSTALL@
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ ALLOWRELEASE = @ALLOWRELEASE@
+
+ # libtool compile/link/install
============================================================
--- packages/sqlite/sqlite3_3.5.2.bb 0edb12%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list