components/pcsc-lite/patches/01-ltmain.sh.patch
branchs11u3-sru
changeset 6361 2a305758f590
equal deleted inserted replaced
6360:9d123b58131d 6361:2a305758f590
       
     1 In-house patch created as a workaround until BugID: 22985199 is completed.
       
     2 
       
     3 This patch is Solaris buildenv specific and may not be suitable for upstream.
       
     4 
       
     5 --- pcsc-lite-1.8.14/ltmain.sh	2016-05-05 13:01:01.885421474 -0400
       
     6 +++ pcsc-lite-1.8.14/ltmain.sh	2016-03-10 19:52:10.679807000 -0500
       
     7 @@ -5662,7 +5662,8 @@
       
     8  	func_append finalize_command " $arg"
       
     9  	case "$new_inherited_linker_flags " in
       
    10  	    *" $arg "*) ;;
       
    11 -	    * ) func_append new_inherited_linker_flags " $arg" ;;
       
    12 +	    * ) func_append new_inherited_linker_flags " $arg" 
       
    13 +		;;
       
    14  	esac
       
    15  	continue
       
    16  	;;
       
    17 @@ -6173,7 +6174,7 @@
       
    18  	    if test "$linkmode" = lib ; then
       
    19  		case "$new_inherited_linker_flags " in
       
    20  		    *" $deplib "*) ;;
       
    21 -		    * ) func_append new_inherited_linker_flags " $deplib" ;;
       
    22 +		    * ) func_append new_inherited_linker_flags "" ;;
       
    23  		esac
       
    24  	    fi
       
    25  	  fi
       
    26 @@ -7145,6 +7146,13 @@
       
    27  	    case $deplib in
       
    28  	    -L*) new_libs="$deplib $new_libs" ;;
       
    29  	    -R*) ;;
       
    30 +	     #
       
    31 +            # XXX: Special case handling for sunstudio and sunlinker on 
       
    32 +            #      Solaris 11 and 12 as -pthread is no longer needed and 
       
    33 +	     #      if passed as an arguement/option to ld, it will error 
       
    34 +            #      when parsed by ld
       
    35 +            #
       
    36 +            -pthread) $new_libs = "$new_libs" ;;
       
    37  	    *)
       
    38  	      # And here is the reason: when a library appears more
       
    39  	      # than once as an explicit dependence of a library, or