7080051 The search and runpath for gcc-3 need to be adjusted
authorRich Burridge <rich.burridge@oracle.com>
Thu, 08 Dec 2011 16:17:00 -0800
changeset 616 26ce2f2c45ec
parent 615 4a4ac540b603
child 617 37f5770ed2dd
7080051 The search and runpath for gcc-3 need to be adjusted
components/gcc3/patches/i386.sol2-10.h.patch
components/gcc3/patches/sol2.h.patch
components/gcc3/patches/sparc.sol2-bi.h.patch
--- a/components/gcc3/patches/i386.sol2-10.h.patch	Thu Dec 08 05:05:22 2011 -0800
+++ b/components/gcc3/patches/i386.sol2-10.h.patch	Thu Dec 08 16:17:00 2011 -0800
@@ -18,12 +18,12 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-!              %{!p:%{!pg:-Y P,/usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}}} \
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib/64:/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/ucblib/64:/usr/lib/libp/64} \
+!              %{!p:%{!pg:-Y P,/usr/sfw/lib/64:/usr/ucblib/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/ucblib/64}}} \
 !              } \
      %{!compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-!              %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /lib/64:/usr/lib/64:/usr/sfw/lib/64}}}}"
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/lib/libp/64} \
+!              %{!p:%{!pg:-Y P,/usr/sfw/lib/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64}}}}"
   
   #undef LINK_ARCH64_SPEC
   #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
--- a/components/gcc3/patches/sol2.h.patch	Thu Dec 08 05:05:22 2011 -0800
+++ b/components/gcc3/patches/sol2.h.patch	Thu Dec 08 16:17:00 2011 -0800
@@ -18,12 +18,12 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib} \
-!              %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}} \
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib:/usr/ucblib:/usr/lib/libp:/lib:/usr/lib -R /usr/sfw/lib:/usr/ucblib:/usr/lib/libp} \
+!              %{!p:%{!pg:-Y P,/usr/sfw/lib:/usr/ucblib:/lib:/usr/lib -R /usr/sfw/lib:/usr/ucblib}}} \
 !              } \
      %{!compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib} \
-!              %{!p:%{!pg:-Y P,/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}}"
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib:/usr/lib/libp:/lib:/usr/lib -R /usr/sfw/lib:/usr/lib/libp} \
+!              %{!p:%{!pg:-Y P,/usr/sfw/lib:/lib:/usr/lib -R /usr/sfw/lib}}}}"
   
   #undef LINK_ARCH32_SPEC
   #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE
--- a/components/gcc3/patches/sparc.sol2-bi.h.patch	Thu Dec 08 05:05:22 2011 -0800
+++ b/components/gcc3/patches/sparc.sol2-bi.h.patch	Thu Dec 08 16:17:00 2011 -0800
@@ -18,12 +18,12 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-!        %{!p:%{!pg:-Y P,/usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}}} \
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib/64:/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/ucblib/64:/usr/lib/libp/64} \
+!        %{!p:%{!pg:-Y P,/usr/sfw/lib/64:/usr/ucblib/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/ucblib/64}}} \
 !      } \
      %{!compat-bsd: \
-!      %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-!        %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /lib/64:/usr/lib/64:/usr/sfw/lib/64}}}}"
+!      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64:/usr/lib/libp/64} \
+!        %{!p:%{!pg:-Y P,/usr/sfw/lib/64:/lib/64:/usr/lib/64 -R /usr/sfw/lib/64}}}}"
   
   #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE