7158472 bad runpaths in cdrecord after gmake upgrade
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 04 Apr 2012 10:45:39 -0700
changeset 759 5bd27f9a56b8
parent 758 8d61ac17827e
child 760 c73130bfdec1
7158472 bad runpaths in cdrecord after gmake upgrade
components/cdrtools/Makefile
components/cdrtools/patches/Defaults.sunos5.patch
--- a/components/cdrtools/Makefile	Wed Apr 04 10:40:48 2012 -0700
+++ b/components/cdrtools/Makefile	Wed Apr 04 10:45:39 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -35,8 +35,8 @@
 include ../../make-rules/justmake.mk
 include ../../make-rules/ips.mk
 
-COMPONENT_INSTALL_ARGS +=  INS_BASE=/usr GMAKE_NOWARN=true
-COMPONENT_BUILD_ARGS += RUNPATH= INS_BASE=/usr GMAKE_NOWARN=true
+COMPONENT_INSTALL_ARGS +=  GMAKE_NOWARN=true
+COMPONENT_BUILD_ARGS += GMAKE_NOWARN=true
 
 build:          $(BUILD_32)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cdrtools/patches/Defaults.sunos5.patch	Wed Apr 04 10:45:39 2012 -0700
@@ -0,0 +1,23 @@
+--- cdrtools-3.00/DEFAULTS/Defaults.sunos5.orig	Mon Apr  2 12:22:58 2012
++++ cdrtools-3.00/DEFAULTS/Defaults.sunos5	Mon Apr  2 12:23:37 2012
[email protected]@ -29,9 +29,9 @@
+ CWARNOPTS=
+ 
+ DEFINCDIRS=	$(SRCROOT)/include
+-LDPATH=		-L/opt/schily/lib
++LDPATH=		
+ #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
++RUNPATH=	
+ 
+ ###########################################################################
+ #
[email protected]@ -38,7 +38,7 @@
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE=	/opt/schily
++INS_BASE=	/usr
+ INS_KBASE=	/
+ INS_RBASE=	/
+ #