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/cdrtools/patches/Defaults.sunos5.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 30 Sep 2016 13:16:50 -0700
changeset 7016 401dd746ea8d
parent 1695 983495f058ad
permissions -rw-r--r--
23279802 Time to start draining the GCC swamp, 4.8 has got to go.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1695
983495f058ad 18165754 Upgrade cdrtools to 3.01a22
Vladimir Marek <Vladimir.Marek@oracle.com>
parents: 759
diff changeset 
     1
 
--- cdrtools-3.01/DEFAULTS/Defaults.sunos5	2014-01-31 05:22:11.622002827 +0100
983495f058ad 18165754 Upgrade cdrtools to 3.01a22
Vladimir Marek <Vladimir.Marek@oracle.com>
parents: 759
diff changeset 
     2
 
+++ cdrtools-3.01/DEFAULTS/Defaults.sunos5	2014-01-31 05:21:20.893210286 +0100
983495f058ad 18165754 Upgrade cdrtools to 3.01a22
Vladimir Marek <Vladimir.Marek@oracle.com>
parents: 759
diff changeset 
     3
 
@@ -30,16 +30,16 @@
759
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 DEFINCDIRS=	$(SRCROOT)/include
1695
983495f058ad 18165754 Upgrade cdrtools to 3.01a22
Vladimir Marek <Vladimir.Marek@oracle.com>
parents: 759
diff changeset 
     6
 
 DEFOSINCDIRS=
759
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
-LDPATH=		-L/opt/schily/lib
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+LDPATH=
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
 #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
+RUNPATH=
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
 ###########################################################################
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
 #
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
 # Installation config stuff
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
 #
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
 
 ###########################################################################
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
-INS_BASE=	/opt/schily
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
 
+INS_BASE=	/usr
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
 
 INS_KBASE=	/
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
 INS_RBASE=	/
5bd27f9a56b8 7158472 bad runpaths in cdrecord after gmake upgrade
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    22
 
 #
upstream/oracle/userland-gate