diff options
33 files changed, 185 insertions, 8282 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 47bb4b91ef..a7d34ca476 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -91,9 +91,9 @@ do_builtin_initramfs() { # Make sure to kill injected initramfs, in case someone will do "-c compile -f" rm usr/initramfs_data.cpio.gz } -addtask builtin_initramfs after do_compile -do_builtin_initramfs[nostamp] = "1" -do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs" +#addtask builtin_initramfs after do_compile +#do_builtin_initramfs[nostamp] = "1" +#do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs" kernel_do_stage() { ASMDIR=`readlink include/asm` diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index ed81a0377e..968aa42c3b 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -44,7 +44,7 @@ def oestats_send(server, action, vars = {}, files = {}): # build headers headers = { - "User-agent": "oestats-client/0.4", + "User-agent": "oestats-client/0.5", "Content-type": "multipart/form-data; boundary=%s" % bound, "Content-length": str(len(body))} @@ -66,8 +66,9 @@ def oestats_start(server, builder, d): try: data = oestats_send(server, "/builds/", { 'builder': builder, - 'branch': bb.data.getVar('METADATA_BRANCH', d, True), - 'revision': bb.data.getVar('METADATA_REVISION', d, True), + 'build_arch': bb.data.getVar('BUILD_ARCH', d, True), + 'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True), + 'metadata_revision': bb.data.getVar('METADATA_REVISION', d, True), 'machine': bb.data.getVar('MACHINE', d, True), 'distro': bb.data.getVar('DISTRO', d, True), }) @@ -117,7 +118,7 @@ def oestats_task(server, d, task, status): except: elapsed = 0 - # send the log for failures + # prepare files files = {} if status == 'Failed': logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task)) @@ -129,18 +130,25 @@ def oestats_task(server, d, task, status): 'content': file(log).read(), 'content-type': 'text/plain'} + # prepare report + vars = { + 'build': id, + 'package': bb.data.getVar('PN', d, True), + 'version': bb.data.getVar('PV', d, True), + 'revision': bb.data.getVar('PR', d, True), + 'depends': bb.data.getVar('DEPENDS', d, True), + 'task': task, + 'status': status, + 'time': str(elapsed)} + bug_number = bb.data.getVar('OESTATS_BUG_NUMBER', d, True) + bug_tracker = bb.data.getVar('OESTATS_BUG_TRACKER', d, True) + if bug_number and bug_tracker: + vars['bug_number'] = bug_number + vars['bug_tracker'] = bug_tracker + # send report try: - response = oestats_send(server, "/tasks/", { - 'build': id, - 'package': bb.data.getVar('PN', d, True), - 'version': bb.data.getVar('PV', d, True), - 'revision': bb.data.getVar('PR', d, True), - 'depends': bb.data.getVar('DEPENDS', d, True), - 'task': task, - 'status': status, - 'time': str(elapsed), - }, files) + response = oestats_send(server, "/tasks/", vars, files) except: bb.note("oestats: error sending task, disabling stats") oestats_setid(d, "") diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 1bdee28fa1..ab8096eb45 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -380,5 +380,10 @@ python seppuku_eventhandler() { else: print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number + # store bug number for oestats-client + if bug_number: + bb.data.setVar('OESTATS_BUG_NUMBER', bug_number, event.data) + bb.data.setVar('OESTATS_BUG_TRACKER', "http://bugs.openembedded.net/", event.data) + return NotHandled } diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c7415a7d8b..bd56a09de6 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -295,7 +295,7 @@ SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi?" SEPPUKU_AUTOBUILD = "1" SEPPUKU_PRODUCT = "Openembedded" -SEPPUKU_COMPONENT = "build" +SEPPUKU_COMPONENT = "org.openembedded.dev" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index e856e40db5..268a24faba 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -20,8 +20,7 @@ inherit autotools pkgconfig update-rc.d RDEPENDS_append = "" # TODO: build and enable all the extra stuff avahi offers -EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" -EXTRA_OECONF_append_mipsel = " --disable-stack-protector" +EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}" AVAHI_PYTHON = "--disable-python" AVAHI_GTK = "--disable-gtk" diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb index 631d4080fd..51786f6da7 100644 --- a/packages/avahi/avahi_0.6.19.bb +++ b/packages/avahi/avahi_0.6.19.bb @@ -1,3 +1,3 @@ require avahi.inc -PR = "r6" +PR = "r7" diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb index 631d4080fd..51786f6da7 100644 --- a/packages/avahi/avahi_0.6.20.bb +++ b/packages/avahi/avahi_0.6.20.bb @@ -1,3 +1,3 @@ require avahi.inc -PR = "r6" +PR = "r7" diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb index 702594fa6e..6e4fa306c3 100644 --- a/packages/avahi/avahi_0.6.21.bb +++ b/packages/avahi/avahi_0.6.21.bb @@ -1,6 +1,6 @@ require avahi.inc -PR = "r6" +PR = "r7" SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1" SRC_URI += "file://avr32-ipv6-fix.patch;patch=1" diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb index d4f15f6199..b37cdfe18d 100644 --- a/packages/avahi/avahi_0.6.22.bb +++ b/packages/avahi/avahi_0.6.22.bb @@ -1,6 +1,6 @@ require avahi.inc DEPENDS += "intltool-native" -PR = "r6" +PR = "r7" PACKAGES =+ "libavahi-gobject" diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb index 64583741cd..5dd08f6e23 100644 --- a/packages/images/minimal-gpe-image.bb +++ b/packages/images/minimal-gpe-image.bb @@ -1,6 +1,6 @@ #Angstrom minimal gpe image # This image provides a barebone dm and 'desktop' -# Very angstrom and ipkg centric +# Very angstrom and opkg centric XSERVER ?= "xserver-kdrive-fbdev" @@ -16,7 +16,7 @@ IMAGE_INSTALL = "\ matchbox-wm \ gpe-terminal \ angstrom-feed-configs \ - ipkg \ + opkg-nogpg opkg-collateral \ " #zap root password for release images diff --git a/packages/images/nas-server-image.bb b/packages/images/nas-server-image.bb index ca8f94e749..85b2bae551 100644 --- a/packages/images/nas-server-image.bb +++ b/packages/images/nas-server-image.bb @@ -20,7 +20,7 @@ # intended to be distro-agnostic. DISTRO_SSH_DAEMON ?= "dropbear" -DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" +DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral" DEPENDS = "\ task-boot \ diff --git a/packages/images/x11-sato-image.bb b/packages/images/x11-sato-image.bb index 980bebbea7..35163953dc 100644 --- a/packages/images/x11-sato-image.bb +++ b/packages/images/x11-sato-image.bb @@ -1,5 +1,5 @@ DISTRO_SSH_DAEMON ?= "dropbear" -DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" +DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral" IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" diff --git a/packages/jpeg/jpeg-6b/debian.patch b/packages/jpeg/jpeg-6b/debian.patch index 823c8e08dc..a169ad19d6 100644 --- a/packages/jpeg/jpeg-6b/debian.patch +++ b/packages/jpeg/jpeg-6b/debian.patch @@ -1,8 +1,3 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - --- jpeg-6b/jpegtran.1~libjpeg6bb-5 +++ jpeg-6b/jpegtran.1 @@ -131,6 +131,24 @@ @@ -41,16 +36,6 @@ # Initialize some other variables. subdirs= -@@ -1559,7 +1559,8 @@ - if test "x$LTSTATIC" = xno; then - disable_static="--disable-static" - fi -- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh -+ chmod a+x $srcdir/ltconfig.new -+ $srcdir/ltconfig.new $disable_shared $disable_static $srcdir/ltmain.new.sh $host - fi - - # Select memory manager depending on user input. --- jpeg-6b/makefile.cfg~libjpeg6bb-5 +++ jpeg-6b/makefile.cfg @@ -17,7 +17,7 @@ @@ -1886,8129 +1871,4 @@ #endif /* TRANSFORMS_SUPPORTED */ ---- jpeg-6b/config.guess~libjpeg6bb-5 -+++ jpeg-6b/config.guess -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.guess ]; then -+ /usr/share/misc/config.guess $* -+ exit $? -+fi -+ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. - # ---- jpeg-6b/config.sub~libjpeg6bb-5 -+++ jpeg-6b/config.sub -@@ -1,4 +1,10 @@ - #! /bin/sh -+# autotools-dev hack (<ballombe@debian.org>, Wed, 14 Nov 2001 10:13:10 +0100) -+if [ -x /usr/share/misc/config.sub ]; then -+ /usr/share/misc/config.sub $* -+ exit $? -+fi -+ - # Configuration validation subroutine script, version 1.1. - # Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. - # This file is (in principle) common to ALL GNU software. ---- /dev/null -+++ jpeg-6b/libtool.cfg -@@ -0,0 +1,224 @@ -+# libtool.cfg - Libtool configuration file. -+# Generated automatically by ltconfig (GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)) -+# Libtool was configured as follows, on host yellowpig: -+# -+# CC="old_CC" CFLAGS="old_CFLAGS" CPPFLAGS="old_CPPFLAGS" \ -+# LD="old_LD" LDFLAGS="old_LDFLAGS" LIBS="old_LIBS" \ -+# NM="old_NM" RANLIB="old_RANLIB" LN_S="old_LN_S" \ -+# DLLTOOL="old_DLLTOOL" OBJDUMP="old_OBJDUMP" AS="old_AS" \ -+# ./ltconfig.new ./ltmain.sh.new i386-gnu -+# -+# Compiler and other test output produced by ltconfig.new, useful for -+# debugging ltconfig.new, is in ./config.log if it exists. -+ -+# The version of ltconfig.new that generated this script. -+LTCONFIG_VERSION=1.3.3 -+ -+# Shell to use when invoking shell scripts. -+SHELL=/bin/sh -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=yes -+ -+# Whether or not to build static libraries. -+build_old_libs=yes -+ -+# Whether or not to optimize for fast installation. -+fast_install=yes -+ -+# The host system. -+host_alias=i386-gnu -+host=i386-pc-gnu -+ -+# An echo program that does not interpret backslashes. -+echo=echo -+ -+# The archiver. -+AR=ar -+ -+# The default C compiler. -+CC=gcc -+ -+# The linker used to build libraries. -+LD=/usr/bin/ld -+ -+# Whether we need hard or soft links. -+LN_S=ln -s -+ -+# A BSD-compatible nm program. -+NM=/usr/bin/nm -B -+ -+# Used on cygwin: DLL creation program. -+DLLTOOL="dlltool" -+ -+# Used on cygwin: object dumper. -+OBJDUMP="objdump" -+ -+# Used on cygwin: assembler. -+AS="as" -+ -+# The name of the directory that contains temporary libtool files. -+objdir=.libs -+ -+# How to create reloadable object files. -+reload_flag= -r -+reload_cmds=$LD$reload_flag -o $output$reload_objs -+ -+# How to pass a linker flag through the compiler. -+wl=-Wl, -+ -+# Object file suffix (normally "o"). -+objext="o" -+ -+# Old archive suffix (normally "a"). -+libext="a" -+ -+# Executable file suffix (normally ""). -+exeext="" -+ -+# Additional compiler flags for building library objects. -+pic_flag= -fPIC -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=yes -+ -+# Can we write directly to a .lo ? -+compiler_o_lo=yes -+ -+# Must we lock files when doing compilation ? -+need_locks=no -+ -+# Do we need the lib prefix for modules? -+need_lib_prefix=no -+ -+# Do we need a version for libraries? -+need_version=no -+ -+# Whether dlopen is supported. -+dlopen=unknown -+ -+# Whether dlopen of programs is supported. -+dlopen_self=unknown -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=unknown -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=-static -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag= -fno-builtin -fno-rtti -fno-exceptions -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=${wl}--export-dynamic -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=${wl}--whole-archive$convenience ${wl}--no-whole-archive -+ -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec= -+ -+# Library versioning type. -+version_type=linux -+ -+# Format of library name prefix. -+libname_spec=lib$name -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so -+ -+# The coded name of the library, if different from the real name. -+soname_spec=${libname}${release}.so$major -+ -+# Commands used to build and install an old-style archive. -+RANLIB=ranlib -+old_archive_cmds=$AR cru $oldlib$oldobjs~$RANLIB $oldlib -+old_postinstall_cmds=$RANLIB $oldlib~chmod 644 $oldlib -+old_postuninstall_cmds= -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds= -+ -+# Commands used to build and install a shared archive. -+archive_cmds=$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib -+archive_expsym_cmds=$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib -+postinstall_cmds= -+postuninstall_cmds= -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=unknown -+ -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd= -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag= -+ -+# Flag that forces no undefined symbols. -+no_undefined_flag= -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds= -+ -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval= -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=sed -n -e 's/^.*[ ]\([ABCDGISTW]\)[ ][ ]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p' -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=sed -n -e 's/^. .* \(.*\)$/extern char \1;/p' -+ -+# This is the shared library runtime path variable. -+runpath_var=LD_RUN_PATH -+ -+# This is the shared library path variable. -+shlibpath_var=LD_LIBRARY_PATH -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=unknown -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=immediate -+ -+# Flag to hardcode $libdir into a binary during linking. -+# This must work even if $libdir does not exist. -+hardcode_libdir_flag_spec=${wl}--rpath ${wl}$libdir -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator= -+ -+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=no -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=no -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=unsupported -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=/lib /usr/lib /usr/local/lib -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=/lib /usr/lib -+ -+# Fix the shell variable $srcfile for the compiler. -+fix_srcfile_path="" -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=no -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$NM $libobjs $convenience | $global_symbol_pipe | sed 's/.* //' | sort | uniq > $export_symbols -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=_GLOBAL_OFFSET_TABLE_ -+ -+# Symbols that must always be exported. -+include_expsyms= -+ ---- /dev/null -+++ jpeg-6b/ltmain.new.sh -@@ -0,0 +1,3975 @@ -+# ltmain.sh - Provide generalized library-building support services. -+# NOTE: Changing this file will not affect anything until you rerun ltconfig. -+# -+# Copyright (C) 1996-1999 Free Software Foundation, Inc. -+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# Check that we have a working $echo. -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell, and then maybe $echo will work. -+ exec $SHELL "$0" --no-reexec ${1+"$@"} -+fi -+ -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+$* -+EOF -+ exit 0 -+fi -+ -+# The name of this program. -+progname=`$echo "$0" | sed 's%^.*/%%'` -+modename="$progname" -+ -+# Constants. -+PROGRAM=ltmain.sh -+PACKAGE=libtool -+VERSION=1.3.3 -+TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" -+ -+default_mode= -+help="Try \`$progname --help' for more information." -+magic="%%%MAGIC variable%%%" -+mkdir="mkdir" -+mv="mv -f" -+rm="rm -f" -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -+SP2NL='tr \040 \012' -+NL2SP='tr \015\012 \040\040' -+ -+# NLS nuisances. -+# Only set LANG and LC_ALL to C if already set. -+# These must not be set unconditionally because not all systems understand -+# e.g. LANG=C (notably SCO). -+# We save the old values to restore during execute mode. -+if test "${LC_ALL+set}" = set; then -+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -+fi -+if test "${LANG+set}" = set; then -+ save_LANG="$LANG"; LANG=C; export LANG -+fi -+ -+if test "$LTCONFIG_VERSION" != "$VERSION"; then -+ echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 -+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit 1 -+fi -+ -+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ echo "$modename: not configured to build any kind of library" 1>&2 -+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit 1 -+fi -+ -+# Global variables. -+mode=$default_mode -+nonopt= -+prev= -+prevopt= -+run= -+show="$echo" -+show_help= -+execute_dlfiles= -+lo2o="s/\\.lo\$/.${objext}/" -+o2lo="s/\\.${objext}\$/.lo/" -+ -+# Parse our command line options once, thoroughly. -+while test $# -gt 0 -+do -+ arg="$1" -+ shift -+ -+ case "$arg" in -+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case "$prev" in -+ execute_dlfiles) -+ eval "$prev=\"\$$prev \$arg\"" -+ ;; -+ *) -+ eval "$prev=\$arg" -+ ;; -+ esac -+ -+ prev= -+ prevopt= -+ continue -+ fi -+ -+ # Have we seen a non-optional argument yet? -+ case "$arg" in -+ --help) -+ show_help=yes -+ ;; -+ -+ --version) -+ echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" -+ exit 0 -+ ;; -+ -+ --config) -+ sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0 -+ exit 0 -+ ;; -+ -+ --debug) -+ echo "$progname: enabling shell trace mode" -+ set -x -+ ;; -+ -+ --dry-run | -n) -+ run=: -+ ;; -+ -+ --features) -+ echo "host: $host" -+ if test "$build_libtool_libs" = yes; then -+ echo "enable shared libraries" -+ else -+ echo "disable shared libraries" -+ fi -+ if test "$build_old_libs" = yes; then -+ echo "enable static libraries" -+ else -+ echo "disable static libraries" -+ fi -+ exit 0 -+ ;; -+ -+ --finish) mode="finish" ;; -+ -+ --mode) prevopt="--mode" prev=mode ;; -+ --mode=*) mode="$optarg" ;; -+ -+ --quiet | --silent) -+ show=: -+ ;; -+ -+ -dlopen) -+ prevopt="-dlopen" -+ prev=execute_dlfiles -+ ;; -+ -+ -*) -+ $echo "$modename: unrecognized option \`$arg'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ ;; -+ -+ *) -+ nonopt="$arg" -+ break -+ ;; -+ esac -+done -+ -+if test -n "$prevopt"; then -+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+fi -+ -+if test -z "$show_help"; then -+ -+ # Infer the operation mode. -+ if test -z "$mode"; then -+ case "$nonopt" in -+ *cc | *++ | gcc* | *-gcc*) -+ mode=link -+ for arg -+ do -+ case "$arg" in -+ -c) -+ mode=compile -+ break -+ ;; -+ esac -+ done -+ ;; -+ *db | *dbx | *strace | *truss) -+ mode=execute -+ ;; -+ *install*|cp|mv) -+ mode=install -+ ;; -+ *rm) -+ mode=uninstall -+ ;; -+ *) -+ # If we have no mode, but dlfiles were specified, then do execute mode. -+ test -n "$execute_dlfiles" && mode=execute -+ -+ # Just use the default operation mode. -+ if test -z "$mode"; then -+ if test -n "$nonopt"; then -+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 -+ else -+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 -+ fi -+ fi -+ ;; -+ esac -+ fi -+ -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$execute_dlfiles" && test "$mode" != execute; then -+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$modename --help --mode=$mode' for more information." -+ -+ # These modes are in order of execution frequency so that they run quickly. -+ case "$mode" in -+ # libtool compile mode -+ compile) -+ modename="$modename: compile" -+ # Get the compilation command and the source file. -+ base_compile= -+ lastarg= -+ srcfile="$nonopt" -+ suppress_output= -+ -+ user_target=no -+ for arg -+ do -+ # Accept any command-line options. -+ case "$arg" in -+ -o) -+ if test "$user_target" != "no"; then -+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -+ exit 1 -+ fi -+ user_target=next -+ ;; -+ -+ -static) -+ build_old_libs=yes -+ continue -+ ;; -+ esac -+ -+ case "$user_target" in -+ next) -+ # The next one is the -o target name -+ user_target=yes -+ continue -+ ;; -+ yes) -+ # We got the output file -+ user_target=set -+ libobj="$arg" -+ continue -+ ;; -+ esac -+ -+ # Accept the current argument as the source file. -+ lastarg="$srcfile" -+ srcfile="$arg" -+ -+ # Aesthetically quote the previous argument. -+ -+ # Backslashify any backslashes, double quotes, and dollar signs. -+ # These are the only characters that are still specially -+ # interpreted inside of double-quoted scrings. -+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` -+ -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly in scan -+ # sets, so we specify it separately. -+ case "$lastarg" in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) |