Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/net-snmp/patches/009.ltmain.sh.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 11 Mar 2016 18:20:02 -0800
changeset 5597 bcd66d6b1f98
parent 1679 51291a5fd692
permissions -rw-r--r--
22739240 Upgrade MySQL 5.5 to 5.5.48 on Solaris (replace package from future)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1679
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     1
 
--- net-snmp-5.4.2.1/ltmain.sh	Fri Jun  6 02:34:34 2008
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     2
 
+++ net-snmp-5.4.2.1/ltmain.mod.sh	Tue Feb  3 11:02:05 2009
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     3
 
@@ -1425,7 +1425,9 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
     4
 
 	  if test "$prev" = rpath; then
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
     5
 
 	    case "$rpath " in
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
     6
 
 	    *" $arg "*) ;;
1679
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     7
 
-	    *) rpath="$rpath $arg" ;;
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     8
 
+	    *) rpath="$rpath $arg"
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
     9
 
+        # This is make sure only $libdir path is encoded in RUNPATH
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    10
 
+        sma_rpath="$rpath" ;;
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    11
 
 	    esac
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    12
 
 	  else
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    13
 
 	    case "$xrpath " in
1679
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    14
 
@@ -3915,7 +3917,7 @@
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    15
 
 	if test "$hardcode_into_libs" = yes; then
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    16
 
 	  # Hardcode the library paths
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    17
 
 	  hardcode_libdirs=
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    18
 
-	  dep_rpath=
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    19
 
+	  dep_rpath="-R $sma_rpath"
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    20
 
 	  rpath="$finalize_rpath"
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    21
 
 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    22
 
 	  for libdir in $rpath; do
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    23
 
@@ -3935,7 +3937,7 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    24
 
 		fi
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    25
 
 	      else
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    26
 
 		eval flag=\"$hardcode_libdir_flag_spec\"
1679
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    27
 
-		dep_rpath="$dep_rpath $flag"
51291a5fd692 backout 17949399/16488880/15685782/15997718/15705167/15754602/16066103/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1650
diff changeset 
    28
 
+		#dep_rpath="$dep_rpath $flag"
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    29
 
 	      fi
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    30
 
 	    elif test -n "$runpath_var"; then
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    31
 
 	      case "$perm_rpath " in
upstream/oracle/userland-gate