[oe-commits] org.oe.dev merge of '5fc01752a7d73572c40917d73b0efb4a550c89dc'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Nov 15 11:04:44 UTC 2007
merge of '5fc01752a7d73572c40917d73b0efb4a550c89dc'
and 'f94559e4a48c2ae3cd234fdf608f511fc04df7be'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: de4ffd91ca63a8f69c4edd8aa96a96feef839faf
ViewMTN: http://monotone.openembedded.org/revision/info/de4ffd91ca63a8f69c4edd8aa96a96feef839faf
Files:
1
contrib/feed-browser/includes/config.inc
packages/sqlite/sqlite3
packages/sqlite/sqlite3/cross-compile.patch
packages/sqlite/sqlite3/ldflags.patch
packages/sqlite/sqlite3/libtool.patch
packages/sqlite/sqlite3_3.4.2.bb
Diffs:
#
# mt diff -r5fc01752a7d73572c40917d73b0efb4a550c89dc -rde4ffd91ca63a8f69c4edd8aa96a96feef839faf
#
#
#
# patch "contrib/feed-browser/includes/config.inc"
# from [9bcb9f854ff6728529de402c08d7094a7ca86dd5]
# to [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
#
============================================================
--- contrib/feed-browser/includes/config.inc 9bcb9f854ff6728529de402c08d7094a7ca86dd5
+++ contrib/feed-browser/includes/config.inc c83ad830b6705b298699f4bad3d61b6ea860b1d2
@@ -139,4 +139,163 @@ $feeds = array(
)
);
+
+$ipkpath = "/var/www/angstrom/unstable/feed/unsorted";
+$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc');
+$device_archs = array(
+ "a1200" => "armv5te",
+ "a780"=> "armv5te",
+ "acern30",
+ "adsp-bf537-stamp" => "bfin",
+ "adzs-bf538f-ezlite" => "bfin",
+ "akita" => "armv5te",
+ "alix",
+ "amsdelta",
+ "asus620",
+ "asus730",
+ "at32stk1000" => "avr32",
+ "at91sam9260ek" => "armv5te",
+ "at91sam9261ek" => "armv5te",
+ "at91sam9263ek" => "armv5te",
+ "atngw100" => "avr32",
+ "aximx50" => "armv5te",
+ "aximx50v" => "armv5te",
+ "borzoi" => "armv5te",
+ "boxer" => "armv5te",
+ "c7x0" => "armv5te",
+ "colinux",
+ "collie",
+ "compulab-pxa270" => "armv5te",
+ "corgi" => "armv5te",
+ "davinci-dvevm",
+ "db1200",
+ "devkitidp-pxa255" => "armv5te",
+ "dht-walnut" => "ppc405",
+ "e680" => "armv5te",
+ "efika" => "ppc603e",
+ "ep93xx" => "armv4t",
+ "epia",
+ "er0100" => "armv5te",
+ "eteng500" => "armv5te",
+ "fic-gta01" => "armv4t",
+ "fic-gta02" => "armv4t",
+ "fsg3be",
+ "geodegx",
+ "geodelx",
+ "guinness",
+ "gumstix-connex" => "armv5te",
+ "gumstix-verdex" => "armv5te",
+ "h1910",
+ "h1940",
+ "h2200" => "armv5te",
+ "h3600" => "arm-oabi",
+ "h3800" => "arm-oabi",
+ "h3900" => "armv5te",
+ "h4000" => "armv5te",
+ "h5000" => "armv5te",
+ "h6300" => "armv4t",
+ "htcalpine",
+ "htcapache",
+ "htcblueangel",
+ "htchimalaya",
+ "htcsable",
+ "htctornado",
+ "htcuniversal" => "armv5te",
+ "htcwallaby",
+ "husky" => "armv5te",
+ "hx2000" => "armv5te",
+ "hx4700" => "armv5te",
+ "i586-generic" => "i586",
+ "i686-generic" => "i586",
+ "ixp4xx",
+ "ixp4xxbe" => "armv5teb",
+ "ixp4xxle" => "armv5te",
+ "jornada56x",
+ "jornada6xx",
+ "jornada7xx",
+ "kb9202" => "armv4t",
+ "ks8695",
+ "lite5200",
+ "logicpd-pxa270" => "armv5te",
+ "looxc550",
+ "lsarm",
+ "lsppchd",
+ "lsppchg",
+ "magicbox",
+ "magician" => "armv5te",
+ "mainstone" => "armv5te",
+ "mnci",
+ "mtx-1",
+ "mtx-2",
+ "mtx-3",
+ "mtx-3a",
+ "mx21ads" => "armv5te",
+ "mx31ads" => "armv6",
+ "n2100",
+ "native",
+ "navman-icn330",
+ "netbook-pro" => "armv5te",
+ "netvista",
+ "nokia770" => "armv5te",
+ "nokia800",
+ "nslu2" => "armv5te",
+ "nslu2be" => "armv5teb",
+ "nslu2le" => "armv5te",
+ "omap1510inn" => "armv5te",
+ "omap1610h2" => "armv5te",
+ "omap1710h3" => "armv5te",
+ "omap2420h4",
+ "omap2430sdp",
+ "omap5912osk" => "armv5te",
+ "palmld" => "armv5te",
+ "palmt650" => "armv5te",
+ "palmt680",
+ "palmtc",
+ "palmtt",
+ "palmtt2",
+ "palmtt3",
+ "palmtt5",
+ "palmtx",
+ "palmz31",
+ "palmz71",
+ "palmz72",
+ "poodle" => "armv5te",
+ "progear",
+ "qemuarm" => "armv5te",
+ "qemux86",
+ "rb500",
+ "rokre2" => "armv5te",
+ "rokre6" => "armv5te",
+ "rt3000",
+ "rx1950",
+ "rx3000",
+ "sarge-at91" => "armv4t",
+ "sequoia",
+ "shark" => "arm-oabi",
+ "shepherd" => "armv5te",
+ "simpad" => "arm-oabi",
+ "smdk2440" => "armv4t",
+ "smdk2443" => "armv4t",
+ "spitz" => "armv5te",
+ "storcenter",
+ "sun4cdm",
+ "terrier" => "armv5te",
+ "titan",
+ "tosa" => "armv5te",
+ "triton",
+ "ts72xx",
+ "turbostation",
+ "wgt634u",
+ "wl500g",
+ "wrap",
+ "wrt54",
+ "x86-32-nocona",
+ "x86-prescott",
+ "x86-uml",
+ "x86",
+ "xilinx-ml403",
+ "xilinx-ml410",
+ "xxs1500",
+ );
+
+?>
-?>
#
# mt diff -rf94559e4a48c2ae3cd234fdf608f511fc04df7be -rde4ffd91ca63a8f69c4edd8aa96a96feef839faf
#
#
#
# add_dir "packages/sqlite/sqlite3"
#
# 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.4.2.bb"
# content [0edb125c6ed5c435fe50102b3d355f2b8061b1ef]
#
============================================================
--- 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.4.2.bb 0edb125c6ed5c435fe50102b3d355f2b8061b1ef
+++ packages/sqlite/sqlite3_3.4.2.bb 0edb125c6ed5c435fe50102b3d355f2b8061b1ef
@@ -0,0 +1 @@
+require sqlite3.inc
More information about the Openembedded-commits
mailing list