Hello community, here is the log from the commit of package babl for openSUSE:Factory checked in at 2018-12-10 12:26:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/babl (Old) and /work/SRC/openSUSE:Factory/.babl.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "babl" Mon Dec 10 12:26:37 2018 rev:45 rq:653854 version:0.1.60 Changes: -------- --- /work/SRC/openSUSE:Factory/babl/babl.changes 2018-11-06 14:03:49.223497364 +0100 +++ /work/SRC/openSUSE:Factory/.babl.new.19453/babl.changes 2018-12-10 12:26:42.494624674 +0100 @@ -1,0 +2,7 @@ +Tue Dec 4 12:46:21 UTC 2018 - [email protected] + +- Update to version 0.1.60: + + Improved thread safety, acceleration for R'G'B'A u8 -> + cairo-ARGB32 conversion. + +------------------------------------------------------------------- @@ -5,3 +12,6 @@ - + Preserve color of transparent pixels in conversion to premultiplied alpha - + Added single precision code-paths for faster fallback/reference conversions - + New BABL_ICC_INTENT_PERFORMANCE bitflag for combing with intent as bitflags + + Preserve color of transparent pixels in conversion to + premultiplied alpha. + + Added single precision code-paths for faster fallback/reference + conversions. + + New BABL_ICC_INTENT_PERFORMANCE bitflag for combing with intent + as bitflags. Old: ---- babl-0.1.58.tar.bz2 New: ---- babl-0.1.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ babl.spec ++++++ --- /var/tmp/diff_new_pack.7Th2Sa/_old 2018-12-10 12:26:42.898624271 +0100 +++ /var/tmp/diff_new_pack.7Th2Sa/_new 2018-12-10 12:26:42.902624266 +0100 @@ -18,7 +18,7 @@ %define debug_package_requires libbabl-0_1-0 = %{version}-%{release} Name: babl -Version: 0.1.58 +Version: 0.1.60 Release: 0 Summary: Dynamic Pixel Format Translation Library License: LGPL-3.0-or-later AND GPL-3.0-or-later ++++++ babl-0.1.58.tar.bz2 -> babl-0.1.60.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/INSTALL new/babl-0.1.60/INSTALL --- old/babl-0.1.58/INSTALL 2018-10-05 16:08:43.000000000 +0200 +++ new/babl-0.1.60/INSTALL 2018-11-09 23:52:54.000000000 +0100 @@ -1,5 +1,5 @@ -babl 0.1.58 +babl 0.1.60 Dynamic; any to any, pixel format conversion library. @@ -12,10 +12,10 @@ installation (or a variation on this theme): ------------------------------------------------------------ - foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.58.tar.bz2 - foo$ tar jxf babl-0.1.58.tar.gz - foo$ cd babl-0.1.58 - foo/babl-0.1.58$ ./configure && make && sudo make install + foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.60.tar.bz2 + foo$ tar jxf babl-0.1.60.tar.gz + foo$ cd babl-0.1.60 + foo/babl-0.1.60$ ./configure && make && sudo make install ------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/NEWS new/babl-0.1.60/NEWS --- old/babl-0.1.58/NEWS 2018-10-05 16:08:01.000000000 +0200 +++ new/babl-0.1.60/NEWS 2018-11-09 23:55:14.000000000 +0100 @@ -3,6 +3,9 @@ the news section both in the README and the webpage. --> +2018-10-05 babl-0.1.60 </dt><dd> +Improved thread safety, acceleration for R'G'B'A u8 -> cairo-ARGB32 conversion. + </dd><dt> 2018-10-05 babl-0.1.58 </dt><dd> Preserve color of transparent pixels in conversion to premultiplied alpha, Added single precision code-paths for faster fallback/reference conversions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/README new/babl-0.1.60/README --- old/babl-0.1.58/README 2018-10-05 16:19:45.000000000 +0200 +++ new/babl-0.1.60/README 2018-11-09 23:57:21.000000000 +0100 @@ -1,4 +1,4 @@ -Babl-0.1.58 +Babl-0.1.60 Contents @@ -63,6 +63,9 @@ release is done a babl release is most often put out just prior to the GEGL release. +2018-10-05 babl-0.1.60 + Improved thread safety, acceleration for R'G'B'A u8 -> cairo-ARGB32 + conversion. 2018-10-05 babl-0.1.58 Preserve color of transparent pixels in conversion to premultiplied alpha, Added single precision code-paths for faster fallback/ @@ -678,43 +681,6 @@ magenta yellow -camayakaA - -components - - ca - ma - ya - ka - A - -cmykA - -components - - cyan - magenta - yellow - key - A - -cmyk - -components - - cyan - magenta - yellow - key - -cmy - -components - - cyan - magenta - yellow - Pixel formats RGBA double @@ -2669,139 +2635,6 @@ u8 yellow u8 key -camayakaA double - -bytes/pixel - 40 -model - camayakaA -components - - double ca - double ma - double ya - double ka - double A - -cmykA double - -bytes/pixel - 40 -model - cmykA -components - - double cyan - double magenta - double yellow - double key - double A - -cmyk double - -bytes/pixel - 32 -model - cmyk -components - - double cyan - double magenta - double yellow - double key - -cmy double - -bytes/pixel - 24 -model - cmy -components - - double cyan - double magenta - double yellow - -camayakaA float - -bytes/pixel - 20 -model - camayakaA -components - - float ca - float ma - float ya - float ka - float A - -cmykA float - -bytes/pixel - 20 -model - cmykA -components - - float cyan - float magenta - float yellow - float key - float A - -cmyk float - -bytes/pixel - 16 -model - cmyk -components - - float cyan - float magenta - float yellow - float key - -cmy float - -bytes/pixel - 12 -model - cmy -components - - float cyan - float magenta - float yellow - -cmyk u8 - -bytes/pixel - 4 -model - cmyk -components - - u8 cyan - u8 magenta - u8 yellow - u8 key - -cmykA u8 - -bytes/pixel - 5 -model - cmykA -components - - u8 cyan - u8 magenta - u8 yellow - u8 key - u8 A - Environment Through the environment variable BABL_TOLERANCE you can control a speed @@ -2857,7 +2690,7 @@ become a speedup when more filters want to integrate in the layer processing pipeline. -There is a post on patreon with further details about details of the +There is a post on patreon with further details about the implementation. TODO @@ -2954,4 +2787,4 @@ Félix Piédallu Initial meson build -/babl-0.1.58 +/babl-0.1.60 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl-conversion.c new/babl-0.1.60/babl/babl-conversion.c --- old/babl-0.1.58/babl/babl-conversion.c 2018-09-06 21:15:06.000000000 +0200 +++ new/babl-0.1.60/babl/babl-conversion.c 2018-11-06 14:21:43.000000000 +0100 @@ -228,20 +228,13 @@ const Babl *src_format = NULL; const Babl *dst_format = NULL; - if (model_is_rgba (BABL (babl->conversion.source)) || - model_is_rgba (BABL (babl->conversion.destination))) - { - src_format = babl_format_with_model_as_type ( - BABL (babl->conversion.source), - babl_type_from_id (BABL_DOUBLE)); - dst_format = babl_format_with_model_as_type ( - BABL (babl->conversion.destination), - babl_type_from_id (BABL_DOUBLE)); - } - else - { - babl_fatal ("neither source nor destination model is RGBA (requirement might be temporary)"); - } + src_format = babl_format_with_model_as_type ( + BABL (babl->conversion.source), + babl_type_from_id (BABL_DOUBLE)); + dst_format = babl_format_with_model_as_type ( + BABL (babl->conversion.destination), + babl_type_from_id (BABL_DOUBLE)); + babl_conversion_new ( src_format, dst_format, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl-icc.c new/babl-0.1.60/babl/babl-icc.c --- old/babl-0.1.58/babl/babl-icc.c 2018-08-30 03:30:40.000000000 +0200 +++ new/babl-0.1.60/babl/babl-icc.c 2018-11-09 23:52:06.000000000 +0100 @@ -626,7 +626,7 @@ "babl profile", NULL, 0, &babl_noconst->space.icc_length); } - *length = babl->space.icc_length; + if (length) *length = babl->space.icc_length; return babl->space.icc_profile; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl-image.c new/babl-0.1.60/babl/babl-image.c --- old/babl-0.1.58/babl/babl-image.c 2018-07-15 15:24:42.000000000 +0200 +++ new/babl-0.1.60/babl/babl-image.c 2018-11-03 13:47:00.000000000 +0100 @@ -105,6 +105,15 @@ { case BABL_FORMAT: components = format->format.components; + +#if 1 + babl = __atomic_exchange_n (&format->format.image_template, NULL, + __ATOMIC_ACQ_REL); +#else + /* todo: add a configure check for the above gcc extension and use + a mutex if we do not have it? + */ + babl = NULL; if (format->format.image_template != NULL) /* single item cache for speeding up subsequent use of linear buffers for subsequent accesses @@ -112,6 +121,10 @@ { babl = format->format.image_template; format->format.image_template = NULL; + } +#endif + if (babl) + { for (i = 0; i < components; i++) { babl->image.data[i] = buffer + offset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl-palette.c new/babl-0.1.60/babl/babl-palette.c --- old/babl-0.1.58/babl/babl-palette.c 2018-07-15 15:24:42.000000000 +0200 +++ new/babl-0.1.60/babl/babl-palette.c 2018-10-31 01:41:18.000000000 +0100 @@ -448,7 +448,10 @@ void *src_model_data) { BablPalette **palptr = src_model_data; - BablPalette *pal = *palptr; + BablPalette *pal; + + assert(palptr); + pal = *palptr; assert(pal); while (n--) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl-version.h new/babl-0.1.60/babl/babl-version.h --- old/babl-0.1.58/babl/babl-version.h 2018-10-05 16:08:43.000000000 +0200 +++ new/babl-0.1.60/babl/babl-version.h 2018-11-09 23:52:53.000000000 +0100 @@ -34,7 +34,7 @@ #define BABL_MAJOR_VERSION 0 #define BABL_MINOR_VERSION 1 -#define BABL_MICRO_VERSION 58 +#define BABL_MICRO_VERSION 60 /** Get the version information on the babl library */ void babl_get_version (int *major, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl.c new/babl-0.1.60/babl/babl.c --- old/babl-0.1.58/babl/babl.c 2018-07-15 15:24:42.000000000 +0200 +++ new/babl-0.1.60/babl/babl.c 2018-11-06 14:19:36.000000000 +0100 @@ -185,6 +185,6 @@ int babl_model_is (const Babl *babl, const char *model) { - return ((babl)==babl_model_with_space(model, babl)); + return babl && ((babl)==babl_model_with_space(model, babl)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/babl/babl.h new/babl-0.1.60/babl/babl.h --- old/babl-0.1.58/babl/babl.h 2018-09-06 21:15:06.000000000 +0200 +++ new/babl-0.1.60/babl/babl.h 2018-10-31 01:41:18.000000000 +0100 @@ -542,7 +542,7 @@ */ int babl_model_is (const Babl *babl, const char *model_name); -#define babl_model_is(babl,model) ((babl)==babl_model_with_space(model,babl)) +#define babl_model_is(babl,model) (babl&&(babl)==babl_model_with_space(model,babl)) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/configure new/babl-0.1.60/configure --- old/babl-0.1.58/configure 2018-10-05 16:08:39.000000000 +0200 +++ new/babl-0.1.60/configure 2018-11-09 23:52:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for babl 0.1.58. +# Generated by GNU Autoconf 2.69 for babl 0.1.60. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='babl' PACKAGE_TARNAME='babl' -PACKAGE_VERSION='0.1.58' -PACKAGE_STRING='babl 0.1.58' +PACKAGE_VERSION='0.1.60' +PACKAGE_STRING='babl 0.1.60' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1383,7 +1383,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures babl 0.1.58 to adapt to many kinds of systems. +\`configure' configures babl 0.1.60 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of babl 0.1.58:";; + short | recursive ) echo "Configuration of babl 0.1.60:";; esac cat <<\_ACEOF @@ -1576,7 +1576,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -babl configure 0.1.58 +babl configure 0.1.60 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1941,7 +1941,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by babl $as_me 0.1.58, which was +It was created by babl $as_me 0.1.60, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2297,11 +2297,11 @@ BABL_MAJOR_VERSION=0 BABL_MINOR_VERSION=1 -BABL_MICRO_VERSION=58 +BABL_MICRO_VERSION=60 BABL_INTERFACE_AGE=1 -BABL_BINARY_AGE=158 -BABL_VERSION=0.1.58 -BABL_REAL_VERSION=0.1.58 +BABL_BINARY_AGE=160 +BABL_VERSION=0.1.60 +BABL_REAL_VERSION=0.1.60 BABL_API_VERSION=0.1 @@ -2336,7 +2336,7 @@ -BABL_LIBRARY_VERSION="157:1:157" +BABL_LIBRARY_VERSION="159:1:159" BABL_CURRENT_MINUS_AGE=0 @@ -2968,7 +2968,7 @@ # Define the identity of the package. PACKAGE='babl' - VERSION='0.1.58' + VERSION='0.1.60' # Some tools Automake needs. @@ -6437,11 +6437,8 @@ test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -14950,7 +14947,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by babl $as_me 0.1.58, which was +This file was extended by babl $as_me 0.1.60, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15016,7 +15013,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -babl config.status 0.1.58 +babl config.status 0.1.60 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/configure.ac new/babl-0.1.60/configure.ac --- old/babl-0.1.58/configure.ac 2018-10-05 16:08:15.000000000 +0200 +++ new/babl-0.1.60/configure.ac 2018-11-09 23:52:38.000000000 +0100 @@ -14,7 +14,7 @@ m4_define([babl_major_version], [0]) m4_define([babl_minor_version], [1]) -m4_define([babl_micro_version], [58]) +m4_define([babl_micro_version], [60]) m4_define([babl_real_version], [babl_major_version.babl_minor_version.babl_micro_version]) m4_define([babl_version], [babl_real_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/docs/index-static.html.in new/babl-0.1.60/docs/index-static.html.in --- old/babl-0.1.58/docs/index-static.html.in 2018-09-11 17:06:32.000000000 +0200 +++ new/babl-0.1.60/docs/index-static.html.in 2018-11-09 23:52:10.000000000 +0100 @@ -372,7 +372,7 @@ expect premultiplied data in more operations which will become a speedup when more filters want to integrate in the layer processing pipeline.</p> -<p>There is a <a href='https://www.patreon.com/posts/premultiplied-in-21014115'>post on patreon</a> with further details about details of the implementation.</p> +<p>There is a <a href='https://www.patreon.com/posts/premultiplied-in-21014115'>post on patreon</a> with further details about the implementation.</p> <a name='TODO'></a> <!--TODO--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/extensions/cairo.c new/babl-0.1.60/extensions/cairo.c --- old/babl-0.1.58/extensions/cairo.c 2018-09-06 21:15:06.000000000 +0200 +++ new/babl-0.1.60/extensions/cairo.c 2018-10-31 01:41:18.000000000 +0100 @@ -187,12 +187,34 @@ uint32_t *dsti = (void*) dst; while (n--) { - unsigned char alpha = src[3]; -#define div_255(a) ((((a)+128)+(((a)+128)>>8))>>8) - *dsti++ = (alpha << 24) + - (div_255 (src[0] * alpha) << 16) + - (div_255 (src[1] * alpha) << 8) + - (div_255 (src[2] * alpha)); + unsigned char alpha = src[3]; +#if SIZE_MAX >= UINT64_MAX /* 64-bit */ + uint64_t rbag = ((uint64_t) src[0] << 48) | + ((uint64_t) src[2] << 32) | + ((uint64_t) 255 << 16) | + ((uint64_t) src[1] << 0); + rbag *= alpha; + rbag += 0x0080008000800080; + rbag += (rbag >> 8) & 0x00ff00ff00ff00ff; + rbag &= 0xff00ff00ff00ff00; + *dsti++ = (uint32_t) (rbag >> 0) | + (uint32_t) (rbag >> 40); +#else /* 32-bit */ + uint32_t rb = ((uint32_t) src[0] << 16) | + ((uint32_t) src[2] << 0); + uint64_t ag = ((uint32_t) 255 << 16) | + ((uint32_t) src[1] << 0); + rb *= alpha; + ag *= alpha; + rb += 0x00800080; + ag += 0x00800080; + rb += (rb >> 8) & 0x00ff00ff; + ag += (ag >> 8) & 0x00ff00ff; + rb &= 0xff00ff00; + ag &= 0xff00ff00; + *dsti++ = (uint32_t) (ag >> 0) | + (uint32_t) (rb >> 8); +#endif src+=4; } } @@ -223,6 +245,8 @@ long n = samples; while (n--) { +#define div_255(a) ((((a)+128)+(((a)+128)>>8))>>8) + unsigned char gray = *src++; unsigned char alpha = *src++; unsigned char val = div_255 (gray * alpha); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/ltmain.sh new/babl-0.1.60/ltmain.sh --- old/babl-0.1.58/ltmain.sh 2018-08-14 18:28:29.000000000 +0200 +++ new/babl-0.1.60/ltmain.sh 2018-11-01 00:27:56.000000000 +0100 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-2.1" +VERSION="2.4.6 Debian-2.4.6-6" package_revision=2.4.6 @@ -64,7 +64,7 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-10-12.13; # UTC +scriptversion=2015-10-04.22; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 @@ -580,16 +580,16 @@ { $debug_cmd - func_quote_arg pretty "$2" - eval "$1+=\\ \$func_quote_arg_result" + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" }' else func_append_quoted () { $debug_cmd - func_quote_arg pretty "$2" - eval "$1=\$$1\\ \$func_quote_arg_result" + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" } fi @@ -1091,184 +1091,135 @@ } -# func_quote_portable EVAL ARG -# ---------------------------- -# Internal function to portably implement func_quote_arg. Note that we still -# keep attention to performance here so we as much as possible try to avoid -# calling sed binary (so far O(N) complexity as long as func_append is O(1)). -func_quote_portable () +# func_quote ARG +# -------------- +# Aesthetically quote one ARG, store the result into $func_quote_result. Note +# that we keep attention to performance here (so far O(N) complexity as long as +# func_append is O(1)). +func_quote () { $debug_cmd - func_quote_portable_result=$2 + func_quote_result=$1 - # one-time-loop (easy break) - while true - do - if $1; then - func_quote_portable_result=`$ECHO "$2" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` - break - fi - - # Quote for eval. - case $func_quote_portable_result in - *[\\\`\"\$]*) - case $func_quote_portable_result in - *[\[\*\?]*) - func_quote_portable_result=`$ECHO "$func_quote_portable_result" | $SED "$sed_quote_subst"` - break - ;; - esac + case $func_quote_result in + *[\\\`\"\$]*) + case $func_quote_result in + *[\[\*\?]*) + func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"` + return 0 + ;; + esac - func_quote_portable_old_IFS=$IFS - for _G_char in '\' '`' '"' '$' + func_quote_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_result do - # STATE($1) PREV($2) SEPARATOR($3) - set start "" "" - func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy - IFS=$_G_char - for _G_part in $func_quote_portable_result - do - case $1 in - quote) - func_append func_quote_portable_result "$3$2" - set quote "$_G_part" "\\$_G_char" - ;; - start) - set first "" "" - func_quote_portable_result= - ;; - first) - set quote "$_G_part" "" - ;; - esac - done + case $1 in + quote) + func_append func_quote_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac done - IFS=$func_quote_portable_old_IFS - ;; - *) ;; - esac - break - done - - func_quote_portable_unquoted_result=$func_quote_portable_result - case $func_quote_portable_result in - # double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # many bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_portable_result=\"$func_quote_portable_result\" + IFS=$func_quote_old_IFS + done ;; + *) ;; esac } -# func_quotefast_eval ARG -# ----------------------- -# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', -# but optimized for speed. Result is stored in $func_quotefast_eval. -if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then - func_quotefast_eval () - { - printf -v func_quotefast_eval_result %q "$1" - } -else - func_quotefast_eval () - { - func_quote_portable false "$1" - func_quotefast_eval_result=$func_quote_portable_result - } -fi - - -# func_quote_arg MODEs ARG -# ------------------------ -# Quote one ARG to be evaled later. MODEs argument may contain zero ore more -# specifiers listed below separated by ',' character. This function returns two -# values: -# i) func_quote_arg_result -# double-quoted (when needed), suitable for a subsequent eval -# ii) func_quote_arg_unquoted_result +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result # has all characters that are still active within double -# quotes backslashified. Available only if 'unquoted' is specified. -# -# Available modes: -# ---------------- -# 'eval' (default) -# - escape shell special characters -# 'expand' -# - the same as 'eval'; but do not quote variable references -# 'pretty' -# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might -# later used in func_quote to get output like: 'echo "a b"' instead of -# 'echo a\ b'. This is slower than default on some shells. -# 'unquoted' -# - produce also $func_quote_arg_unquoted_result which does not contain -# wrapping double-quotes. -# -# Examples for 'func_quote_arg pretty,unquoted string': -# -# string | *_result | *_unquoted_result -# ------------+-----------------------+------------------- -# " | \" | \" -# a b | "a b" | a b -# "a b" | "\"a b\"" | \"a b\" -# * | "*" | * -# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" -# -# Examples for 'func_quote_arg pretty,unquoted,expand string': -# -# string | *_result | *_unquoted_result -# --------------+---------------------+-------------------- -# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" -func_quote_arg () -{ - _G_quote_expand=false - case ,$1, in - *,expand,*) - _G_quote_expand=: - ;; - esac - - case ,$1, in - *,pretty,*|*,expand,*|*,unquoted,*) - func_quote_portable $_G_quote_expand "$2" - func_quote_arg_result=$func_quote_portable_result - func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result - ;; - *) - # Faster quote-for-eval for some shells. - func_quotefast_eval "$2" - func_quote_arg_result=$func_quotefast_eval_result - ;; - esac -} - - -# func_quote MODEs ARGs... -# ------------------------ -# Quote all ARGs to be evaled later and join them into single command. See -# func_quote_arg's description for more info. -func_quote () +# quotes backslashified. +func_quote_for_eval () { $debug_cmd - _G_func_quote_mode=$1 ; shift - func_quote_result= + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= while test 0 -lt $#; do - func_quote_arg "$_G_func_quote_mode" "$1" - if test -n "$func_quote_result"; then - func_append func_quote_result " $func_quote_arg_result" + func_quote "$1" + _G_unquoted_arg=$func_quote_result + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" else - func_append func_quote_result "$func_quote_arg_result" + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" fi shift done } +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + # func_stripname PREFIX SUFFIX NAME # --------------------------------- # strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. @@ -1311,8 +1262,8 @@ _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_arg pretty,expand "$_G_cmd" - eval "func_notquiet $func_quote_arg_result" + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" $opt_dry_run || { eval "$_G_cmd" @@ -1337,8 +1288,8 @@ _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_arg expand,pretty "$_G_cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || { @@ -1466,7 +1417,7 @@ #! /bin/sh # Set a version string for this script. -scriptversion=2015-10-12.13; # UTC +scriptversion=2015-10-07.11; # UTC # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 @@ -1676,8 +1627,8 @@ # ' # # No change in '$@' (ignored completely by this hook). There is # # no need to do the equivalent (but slower) action: -# # func_quote eval ${1+"$@"} -# # my_options_prep_result=$func_quote_result +# # func_quote_for_eval ${1+"$@"} +# # my_options_prep_result=$func_quote_for_eval_result # false # } # func_add_hook func_options_prep my_options_prep @@ -1713,8 +1664,8 @@ # done # # if $args_changed; then -# func_quote eval ${1+"$@"} -# my_silent_option_result=$func_quote_result +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result # fi # # $args_changed @@ -1781,8 +1732,8 @@ if $_G_rc_options; then func_options_result=$_G_res_var else - func_quote eval ${1+"$@"} - func_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + func_options_result=$func_quote_for_eval_result fi $_G_rc_options @@ -1925,8 +1876,8 @@ if $_G_rc_parse_options; then # save modified positional parameters for caller - func_quote eval ${1+"$@"} - func_parse_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result fi $_G_rc_parse_options @@ -2237,7 +2188,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-2.1 + version: $progname $scriptversion Debian-2.4.6-6 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2471,8 +2422,8 @@ if $_G_rc_lt_options_prep; then # Pass back the list of options. - func_quote eval ${1+"$@"} - libtool_options_prep_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result fi $_G_rc_lt_options_prep @@ -2578,8 +2529,8 @@ if $_G_rc_lt_parse_options; then # save modified positional parameters for caller - func_quote eval ${1+"$@"} - libtool_parse_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result fi $_G_rc_lt_parse_options @@ -2639,8 +2590,8 @@ } # Pass back the unparsed argument list - func_quote eval ${1+"$@"} - libtool_validate_options_result=$func_quote_result + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } func_add_hook func_validate_options libtool_validate_options @@ -3606,8 +3557,8 @@ esac done - func_quote_arg pretty "$libobj" - test "X$libobj" != "X$func_quote_arg_result" \ + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3680,8 +3631,8 @@ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_arg pretty "$srcfile" - qsrcfile=$func_quote_arg_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -4284,8 +4235,8 @@ case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_arg pretty "$nonopt" - install_prog="$func_quote_arg_result " + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " arg=$1 shift else @@ -4295,8 +4246,8 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_arg pretty "$arg" - func_append install_prog "$func_quote_arg_result" + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4353,12 +4304,12 @@ esac # Aesthetically quote the argument. - func_quote_arg pretty "$arg" - func_append install_prog " $func_quote_arg_result" + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" if test -n "$arg2"; then - func_quote_arg pretty "$arg2" + func_quote_for_eval "$arg2" fi - func_append install_shared_prog " $func_quote_arg_result" + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -4369,8 +4320,8 @@ if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_arg pretty "$install_override_mode" - func_append install_shared_prog " -m $func_quote_arg_result" + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" fi fi @@ -4666,8 +4617,8 @@ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_arg expand,pretty "$relink_command" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else @@ -5446,8 +5397,8 @@ if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - func_quote_arg pretty "$ECHO" - qECHO=$func_quote_arg_result + func_quote "$ECHO" + qECHO=$func_quote_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5457,7 +5408,7 @@ \$1 _LTECHO_EOF' } - ECHO=$qECHO + ECHO=\"$qECHO\" fi # Very basic option parsing. These options are (a) specific to @@ -6800,9 +6751,9 @@ while test "$#" -gt 0; do arg=$1 shift - func_quote_arg pretty,unquoted "$arg" - qarg=$func_quote_arg_unquoted_result - func_append libtool_args " $func_quote_arg_result" + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -7400,9 +7351,9 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_arg pretty "$flag" - func_append arg " $func_quote_arg_result" - func_append compiler_flags " $func_quote_arg_result" + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7416,10 +7367,10 @@ save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_arg pretty "$flag" - func_append arg " $wl$func_quote_arg_result" - func_append compiler_flags " $wl$func_quote_arg_result" - func_append linker_flags " $func_quote_arg_result" + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7443,8 +7394,8 @@ # -msg_* for osf cc -msg_*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -7468,8 +7419,8 @@ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -specs=*|-fsanitize=*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7490,15 +7441,15 @@ continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result fi ;; # Some other compiler flag. -* | +*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -7618,8 +7569,8 @@ *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result ;; esac # arg @@ -10131,8 +10082,8 @@ for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_arg expand,pretty "$cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10225,8 +10176,8 @@ eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_arg expand,pretty "$cmd" - eval "func_echo $func_quote_arg_result" + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10700,12 +10651,12 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_arg pretty "$var_value" - relink_command="$var=$func_quote_arg_result; export $var; $relink_command" + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done - func_quote_arg pretty,unquoted "(cd `pwd`; $relink_command)" - relink_command=$func_quote_arg_unquoted_result + func_quote "(cd `pwd`; $relink_command)" + relink_command=$func_quote_result fi # Only actually do things if not in dry run mode. @@ -10945,14 +10896,14 @@ elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_arg pretty,unquoted "$var_value" - relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - func_quote_arg pretty,unquoted "$relink_command" - relink_command=$func_quote_arg_unquoted_result + func_quote "$relink_command" + relink_command=$func_quote_result if test yes = "$hardcode_automatic"; then relink_command= fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/babl-0.1.58/m4/libtool.m4 new/babl-0.1.60/m4/libtool.m4 --- old/babl-0.1.58/m4/libtool.m4 2018-08-14 18:28:29.000000000 +0200 +++ new/babl-0.1.60/m4/libtool.m4 2018-11-01 00:27:56.000000000 +0100 @@ -4063,7 +4063,8 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -6438,7 +6439,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6813,7 +6814,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6878,7 +6879,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7217,7 +7218,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7301,7 +7302,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7312,7 +7313,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
