Mercurial Mercurial > sustaining > oi_151a > spec-files / 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.
patches/mozilla-07-no-ldlibpath.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 7589 94ad5a8d0612
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7589
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     1
 
--- thunderbird/build/unix/run-mozilla.sh.ori	2006-07-07 11:07:14.750490000 +0800
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     2
 
+++ thunderbird/build/unix/run-mozilla.sh	2006-07-07 11:14:25.418853000 +0800
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     3
 
@@ -328,18 +328,18 @@
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     4
 
 fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     5
 
 ##
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     6
 
 ## Set LD_LIBRARY_PATH
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     7
 
-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     8
 
-if [ -n "$LD_LIBRARYN32_PATH" ]
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
     9
 
-then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    10
 
-	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    11
 
-fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    12
 
-if [ -n "$LD_LIBRARYN64_PATH" ]
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    13
 
-then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    14
 
-	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    15
 
-fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    16
 
-if [ -n "$LD_LIBRARY_PATH_64" ]; then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    17
 
-	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    18
 
-fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    19
 
+#LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    20
 
+#if [ -n "$LD_LIBRARYN32_PATH" ]
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    21
 
+#then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    22
 
+#	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    23
 
+#fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    24
 
+#if [ -n "$LD_LIBRARYN64_PATH" ]
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    25
 
+#then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    26
 
+#	LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    27
 
+#fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    28
 
+#if [ -n "$LD_LIBRARY_PATH_64" ]; then
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    29
 
+#	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"}
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    30
 
+#fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    31
 
 #
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    32
 
 #
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    33
 
 ## Set SHLIB_PATH for HPUX
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    34
 
@@ -413,7 +413,8 @@
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    35
 
   echo "     moz_debugger=$moz_debugger"
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    36
 
 fi
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    37
 
 #
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    38
 
-export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    39
 
+#export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    40
 
+export MOZILLA_FIVE_HOME
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    41
 
 export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    42
94ad5a8d0612 2006-07-07 Dave Lin <[email protected]>
jl141263
parents:
diff changeset 
    43
 
 if [ $moz_debug -eq 1 ]
sustaining/oi_151a/spec-files