Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7131234 userland should remove references to /usr/ucb
authorRich Burridge <rich.burridge@oracle.com>
Thu, 26 Jan 2012 05:02:03 -0800
changeset 667 bf7a382b5272
parent 666 3e3828ae1878
child 668 49f7eecdeb8f
7131234 userland should remove references to /usr/ucb
components/erlang/Makefile file | annotate | diff | comparison | revisions
components/erlang/patches/configure.patch file | annotate | diff | comparison | revisions
components/gcc3/patches/i386.sol2-10.h.patch file | annotate | diff | comparison | revisions
components/gcc3/patches/sol2.h.patch file | annotate | diff | comparison | revisions
components/gcc3/patches/sparc.sol2-bi.h.patch file | annotate | diff | comparison | revisions
components/git/Makefile file | annotate | diff | comparison | revisions 
--- a/components/erlang/Makefile	Wed Jan 25 12:39:25 2012 -0800
+++ b/components/erlang/Makefile	Thu Jan 26 05:02:03 2012 -0800
@@ -66,7 +66,6 @@
 
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
-CONFIGURE_OPTIONS += INSTALL="/usr/ucb/install -c"
 CONFIGURE_OPTIONS += --enable-smp-support
 CONFIGURE_OPTIONS += --enable-threads
 CONFIGURE_OPTIONS += --enable-hipe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/erlang/patches/configure.patch	Thu Jan 26 05:02:03 2012 -0800
@@ -0,0 +1,37 @@
+--- otp_src_R12B-5/lib/erl_interface/configure.orig	Wed Jan 25 05:47:46 2012
++++ otp_src_R12B-5/lib/erl_interface/configure	Wed Jan 25 05:51:11 2012
+@@ -5043,16 +5043,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-case $host in
+-  *-*-solaris*|free_source)
+-    if test -x /usr/ucb/install; then
+-      INSTALL="/usr/ucb/install -c"
+-    fi
+-    ;;
+-  *)
+-    ;;
+-esac
+-
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+--- otp_src_R12B-5/erts/configure.orig	Wed Jan 25 06:18:20 2012
++++ otp_src_R12B-5/erts/configure	Wed Jan 25 06:18:34 2012
+@@ -5283,15 +5283,6 @@
+ 
+ _search_path=
+ 
+-case $host in
+-  *-*-solaris*|free_source)
+-    if test -x /usr/ucb/install; then
+-      INSTALL="/usr/ucb/install -c"
+-    fi
+-    ;;
+-  *)
+-    ;;
+-esac
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
--- a/components/gcc3/patches/i386.sol2-10.h.patch	Wed Jan 25 12:39:25 2012 -0800
+++ b/components/gcc3/patches/i386.sol2-10.h.patch	Thu Jan 26 05:02:03 2012 -0800
@@ -18,8 +18,8 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!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}}} \
+!      %{!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}}} \
 !              } \
      %{!compat-bsd: \
 !      %{!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} \
--- a/components/gcc3/patches/sol2.h.patch	Wed Jan 25 12:39:25 2012 -0800
+++ b/components/gcc3/patches/sol2.h.patch	Thu Jan 26 05:02:03 2012 -0800
@@ -18,8 +18,8 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!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}}} \
+!      %{!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}}} \
 !              } \
      %{!compat-bsd: \
 !      %{!YP,*:%{p|pg:-Y P,/usr/sfw/lib:/usr/lib/libp:/lib:/usr/lib -R /usr/sfw/lib:/usr/lib/libp} \
--- a/components/gcc3/patches/sparc.sol2-bi.h.patch	Wed Jan 25 12:39:25 2012 -0800
+++ b/components/gcc3/patches/sparc.sol2-bi.h.patch	Thu Jan 26 05:02:03 2012 -0800
@@ -18,8 +18,8 @@
      %{YP,*} \
      %{R*} \
      %{compat-bsd: \
-!      %{!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}}} \
+!      %{!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}}} \
 !      } \
      %{!compat-bsd: \
 !      %{!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} \
--- a/components/git/Makefile	Wed Jan 25 12:39:25 2012 -0800
+++ b/components/git/Makefile	Thu Jan 26 05:02:03 2012 -0800
@@ -49,6 +49,7 @@
 
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
 COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell $(PERL) -MConfig -e 'print "$$Config{installvendorarch}"')
+COMPONENT_INSTALL_ARGS+=	INSTALL="$(INSTALL)"
 
 COMPONENT_TEST_TARGETS = test
upstream/oracle/userland-gate