[oe-commits] org.oe.dev jpeg: Sync with poky, massively improve libtool handling and drop pointless sections of debian patch (200k of them)
rpurdie commit
oe at amethyst.openembedded.net
Thu May 22 10:42:59 UTC 2008
jpeg: Sync with poky, massively improve libtool handling and drop pointless sections of debian patch (200k of them)
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 2280c7233e5c8d278a16f63319c5415517abca43
ViewMTN: http://monotone.openembedded.org/revision/info/2280c7233e5c8d278a16f63319c5415517abca43
Files:
1
packages/jpeg/jpeg-6b/install.patch
packages/jpeg/jpeg-6b/libtool.patch
packages/jpeg/jpeg-6b/libtool_tweak.patch
packages/jpeg/jpeg-6b/debian.patch
packages/jpeg/jpeg_6b.bb
Diffs:
#
# mt diff -rd84d3829b2f6a4c1d1cb91496cd7ffa088ed323f -r2280c7233e5c8d278a16f63319c5415517abca43
#
#
#
# delete "packages/jpeg/jpeg-6b/install.patch"
#
# rename "packages/jpeg/jpeg-6b/libtool.patch"
# to "packages/jpeg/jpeg-6b/libtool_tweak.patch"
#
# patch "packages/jpeg/jpeg-6b/debian.patch"
# from [99bf3d9e426841282a723c49d473082b018f76d2]
# to [6224a5ac1ce196fc588a069308a8526109ab4571]
#
# patch "packages/jpeg/jpeg-6b/libtool_tweak.patch"
# from [e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8]
# to [f77f2f59ccee20a2199db6cbf30ef5f5243cf96a]
#
# patch "packages/jpeg/jpeg_6b.bb"
# from [0f825c07e85f10fdd361d224cb45a1f833962d0d]
# to [2f1cd5402f50d3be05860e5fd4688329e8337c73]
#
============================================================
--- packages/jpeg/jpeg-6b/debian.patch 99bf3d9e426841282a723c49d473082b018f76d2
+++ packages/jpeg/jpeg-6b/debian.patch 6224a5ac1ce196fc588a069308a8526109ab4571
@@ -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 at 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 at 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 at 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 compi%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list