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/python/simplejson/simplejson-GENFRAG.p5m
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 16 Oct 2013 10:00:08 -0700
changeset 1512 f57514e19ede
parent 1105 e745d9f4429b
child 1666 69d14d547e77
permissions -rw-r--r--
17596443 nm -p output change breaks userland 17361780 LD_Z_TEXT should, ya know, contain -z text not -z direct 17602195 elf_wrong_location_check could be better
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1105
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
# CDDL HEADER START
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
# The contents of this file are subject to the terms of the
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
# Common Development and Distribution License (the "License").
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
# You may not use this file except in compliance with the License.
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
# or http://www.opensolaris.org/os/licensing.
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
# See the License for the specific language governing permissions
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
# and limitations under the License.
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
# When distributing Covered Code, include this CDDL HEADER in each
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
# If applicable, add the following below this CDDL HEADER, with the
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
# fields enclosed by brackets "[]" replaced with your own identifying
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
# information: Portions Copyright [yyyy] [name of copyright owner]
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
# CDDL HEADER END
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
#
e745d9f4429b 15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 












e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    22


#













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    23


# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    24


#













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    25














e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    26


# simplejson was previously in the 'desktop' consolidation. This optional













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    27


# dependency is here to facilitate the safe transfer of the package













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    28


# to the 'userland' consolidation.













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    29


depend type=optional \













e745d9f4429b
15820220 SUNBT7202660 Move python/simplejson from Desktop consolidation to Userland



Rich Burridge <rich.burridge@oracle.com>


parents: 

diff
changeset




    30


    fmri=consolidation/desktop/[email protected]















upstream/oracle/userland-gate