third_party/yasm/patched-yasm/config/config.rpath - Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

Unified Diff: third_party/yasm/patched-yasm/config/config.rpath

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/yasm/patched-yasm/config/config.rpath

===================================================================

--- third_party/yasm/patched-yasm/config/config.rpath (revision 71129)

+++ third_party/yasm/patched-yasm/config/config.rpath (working copy)

@@ -2,7 +2,7 @@

# Output a system dependent set of variables, describing how to set the

# run time search path of shared libraries in an executable.

# Taken from GNU libtool, 2001

# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

@@ -64,7 +64,7 @@

;;

esac

;;

- mingw* | pw32* | os2*)

+ mingw* | cygwin* | pw32* | os2*)

;;

hpux9* | hpux10* | hpux11*)

wl='-Wl,'

@@ -74,7 +74,7 @@

;;

newsos6)

;;

- linux*)

+ linux* | k*bsd*-gnu)

case $cc_basename in

icc* | ecc*)

wl='-Wl,'

@@ -100,7 +100,7 @@

osf3* | osf4* | osf5*)

wl='-Wl,'

;;

- sco3.2v5*)

+ rdos*)

;;

solaris*)

wl='-Wl,'

@@ -108,11 +108,14 @@

sunos4*)

wl='-Qoption ld '

;;

- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)

+ sysv4 | sysv4.2uw2* | sysv4.3*)

wl='-Wl,'

;;

sysv4*MP*)

;;

+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)

+ wl='-Wl,'

+ ;;

unicos*)

wl='-Wl,'

;;

@@ -189,11 +192,11 @@

ld_shlibs=no

;;

- interix3*)

+ interix[3-9]*)

hardcode_direct=no

hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

;;

- linux*)

+ gnu* | linux* | k*bsd*-gnu)

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

else

@@ -280,7 +283,7 @@

strings "$collect2name" | grep resolve_lib_name >/dev/null

then

# We have reworked collect2

- hardcode_direct=yes

+ :

else

# We have old collect2

hardcode_direct=unsupported

@@ -359,7 +362,7 @@

hardcode_direct=yes

hardcode_minus_L=yes

;;

- freebsd* | kfreebsd*-gnu | dragonfly*)

+ freebsd* | dragonfly*)

hardcode_libdir_flag_spec='-R$libdir'

hardcode_direct=yes

;;

@@ -412,18 +415,22 @@

hardcode_libdir_separator=:

;;

openbsd*)

- hardcode_direct=yes

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

+ if test -f /usr/libexec/ld.so; then

+ hardcode_direct=yes

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

+ else

+ case "$host_os" in

+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

+ hardcode_libdir_flag_spec='-R$libdir'

+ ;;

+ *)

+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

+ ;;

+ esac

+ fi

else

- case "$host_os" in

- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

- hardcode_libdir_flag_spec='-R$libdir'

- ;;

- *)

- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

- ;;

- esac

+ ld_shlibs=no

;;

os2*)

@@ -471,7 +478,7 @@

ld_shlibs=yes

;;

- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)

+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)

;;

sysv5* | sco3.2v5* | sco5v6*)

hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'

@@ -488,33 +495,51 @@

# Check dynamic linker characteristics

# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.

+# Unlike libtool.m4, here we don't care about _all_ names of the library, but

+# only about the one the linker finds when passed -lNAME. This is the last

+# element of library_names_spec in libtool.m4, or possibly two of them if the

+# linker has special search rules.

+library_names_spec= # the last element of library_names_spec in libtool.m4

libname_spec='lib$name'

case "$host_os" in

aix3*)

+ library_names_spec='$libname.a'

;;

aix4* | aix5*)

+ library_names_spec='$libname$shrext'

;;

amigaos*)

+ library_names_spec='$libname.a'

;;

beos*)

+ library_names_spec='$libname$shrext'

;;

bsdi[45]*)

+ library_names_spec='$libname$shrext'

;;

cygwin* | mingw* | pw32*)

shrext=.dll

+ library_names_spec='$libname.dll.a $libname.lib'

;;

darwin* | rhapsody*)

shrext=.dylib

+ library_names_spec='$libname$shrext'

;;

dgux*)

+ library_names_spec='$libname$shrext'

;;

freebsd1*)

;;

- kfreebsd*-gnu)

- ;;

freebsd* | dragonfly*)

+ case "$host_os" in

+ freebsd[123]*)

+ library_names_spec='$libname$shrext$versuffix' ;;

+ *)

+ library_names_spec='$libname$shrext' ;;

+ esac

;;

gnu*)

+ library_names_spec='$libname$shrext'

;;

hpux9* | hpux10* | hpux11*)

case $host_cpu in

@@ -528,10 +553,13 @@

shrext=.sl

;;

esac

+ library_names_spec='$libname$shrext'

;;

- interix3*)

+ interix[3-9]*)

+ library_names_spec='$libname$shrext'

;;

irix5* | irix6* | nonstopux*)

+ library_names_spec='$libname$shrext'

case "$host_os" in

irix5* | nonstopux*)

libsuff= shlibsuff=

@@ -548,41 +576,59 @@

;;

linux*oldld* | linux*aout* | linux*coff*)

;;

- linux*)

+ linux* | k*bsd*-gnu)

+ library_names_spec='$libname$shrext'

;;

knetbsd*-gnu)

+ library_names_spec='$libname$shrext'

;;

netbsd*)

+ library_names_spec='$libname$shrext'

;;

newsos6)

+ library_names_spec='$libname$shrext'

;;

nto-qnx*)

+ library_names_spec='$libname$shrext'

;;

openbsd*)

+ library_names_spec='$libname$shrext$versuffix'

;;

os2*)

libname_spec='$name'

shrext=.dll

+ library_names_spec='$libname.a'

;;

osf3* | osf4* | osf5*)

+ library_names_spec='$libname$shrext'

;;

+ rdos*)

+ ;;

solaris*)

+ library_names_spec='$libname$shrext'

;;

sunos4*)

+ library_names_spec='$libname$shrext$versuffix'

;;

sysv4 | sysv4.3*)

+ library_names_spec='$libname$shrext'

;;

sysv4*MP*)

+ library_names_spec='$libname$shrext'

;;

+ library_names_spec='$libname$shrext'

;;

uts4*)

+ library_names_spec='$libname$shrext'

;;

esac

sed_quote_subst='s/$["`$\\]$/\\\1/g'

escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`

shlibext=`echo "$shrext" | sed -e 's,^\.,,'`

+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF

@@ -596,6 +642,12 @@

# Shared library suffix (normally "so").

shlibext="$shlibext"

+# Format of library name prefix.

+libname_spec="$escaped_libname_spec"

+# Library names that the linker finds when passed -lNAME.

+library_names_spec="$escaped_library_names_spec"

# Flag to hardcode \$libdir into a binary during linking.

# This must work even if \$libdir does not exist.

hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

« no previous file with comments | « third_party/yasm/patched-yasm/config.h.in ('k') | third_party/yasm/patched-yasm/config/depcomp » ('j') | no next file with comments »