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/cmake/patches-post-config/CmakeCache-txt.patch
author April Chin <april.chin@oracle.com>
Fri, 17 Jun 2011 10:55:05 -0700
changeset 312 6ca02fd5a199
permissions -rw-r--r--
7053567 Move cmake from SFW to Userland 6860429 cmake installs everything in ./sfw_stage - CMAKE_INSTALL_PREFIX is not used
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
312
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     1
 
diff -u ./CMakeCache.txt ./CMakeCache.txt
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     2
 
--- ./CMakeCache.txt	Wed Jun  1 11:23:27 2011
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     3
 
+++ ./CMakeCache.txt.new	Wed Jun  1 11:23:28 2011
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     4
 
@@ -435,7 +435,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     5
 
 cmcompress_LIB_DEPENDS:STATIC=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     6
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     7
 
 //Dependencies for the target
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     8
 
-cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;crypto;general;ssl;general;idn;general;cmzlib;
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     9
 
+cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;idn;general;cmzlib;
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    10
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    11
 
 //Dependencies for target
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    12
 
 cmexpat_LIB_DEPENDS:STATIC=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    13
 
@@ -720,7 +720,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    14
 
 //Result of TRY_COMPILE
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    15
 
 HAVE_CMEXPAT_BIGENDIAN:INTERNAL=TRUE
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    16
 
 //Have symbol CRYPTO_cleanup_all_ex_data
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    17
 
-HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    18
 
+HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    19
 
 //Have include HAVE_CTYPE_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    20
 
 HAVE_CTYPE_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    21
 
 //Have include HAVE_DIRENT_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    22
 
@@ -729,7 +729,7 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    23
 
 HAVE_DIRNAME:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    24
 
 //Have include HAVE_DLFCN_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    25
 
 HAVE_DLFCN_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    26
 
-//Have library dl;socket;nsl;crypto;ssl;idn
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    27
 
+//Have library dl;socket;nsl;idn
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    28
 
 HAVE_DLOPEN:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    29
 
 //Have include elf.h
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    30
 
 HAVE_ELF_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    31
 
@@ -852,19 +852,19 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    32
 
 //Have symbol lchown
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    33
 
 HAVE_LCHOWN:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    34
 
 //Have library crypto;dl;socket;nsl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    35
 
-HAVE_LIBCRYPTO:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    36
 
+HAVE_LIBCRYPTO:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    37
 
 //Have library dl;
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    38
 
 HAVE_LIBDL:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    39
 
 //Have include HAVE_LIBGEN_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    40
 
 HAVE_LIBGEN_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    41
 
-//Have library idn;dl;socket;nsl;crypto;ssl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    42
 
+//Have library idn;dl;socket;nsl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    43
 
 HAVE_LIBIDN:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    44
 
 //Have library nsl;dl;socket
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    45
 
 HAVE_LIBNSL:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    46
 
 //Have library socket;dl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    47
 
 HAVE_LIBSOCKET:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    48
 
-//Have library ssl;dl;socket;nsl;crypto
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    49
 
-HAVE_LIBSSL:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    50
 
+//Have library ssl;dl;socket;nsl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    51
 
+HAVE_LIBSSL:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    52
 
 //Have library winmm;dl;socket;nsl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    53
 
 HAVE_LIBWINMM:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    54
 
 //Have library ws2_32;dl;socket;nsl
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    55
 
@@ -898,23 +898,23 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    56
 
 //Have include HAVE_NET_IF_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    57
 
 HAVE_NET_IF_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    58
 
 //Have include HAVE_OPENSSL_CRYPTO_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    59
 
-HAVE_OPENSSL_CRYPTO_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    60
 
+HAVE_OPENSSL_CRYPTO_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    61
 
 //Have include HAVE_OPENSSL_ENGINE_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    62
 
-HAVE_OPENSSL_ENGINE_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    63
 
+HAVE_OPENSSL_ENGINE_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    64
 
 //Have include HAVE_OPENSSL_ERR_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    65
 
-HAVE_OPENSSL_ERR_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    66
 
+HAVE_OPENSSL_ERR_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    67
 
 //Have include HAVE_OPENSSL_PEM_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    68
 
-HAVE_OPENSSL_PEM_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    69
 
+HAVE_OPENSSL_PEM_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    70
 
 //Have include HAVE_OPENSSL_PKCS12_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    71
 
-HAVE_OPENSSL_PKCS12_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    72
 
+HAVE_OPENSSL_PKCS12_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    73
 
 //Have include HAVE_OPENSSL_RAND_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    74
 
-HAVE_OPENSSL_RAND_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    75
 
+HAVE_OPENSSL_RAND_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    76
 
 //Have include HAVE_OPENSSL_RSA_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    77
 
-HAVE_OPENSSL_RSA_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    78
 
+HAVE_OPENSSL_RSA_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    79
 
 //Have include HAVE_OPENSSL_SSL_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    80
 
-HAVE_OPENSSL_SSL_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    81
 
+HAVE_OPENSSL_SSL_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    82
 
 //Have include HAVE_OPENSSL_X509_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    83
 
-HAVE_OPENSSL_X509_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    84
 
+HAVE_OPENSSL_X509_H:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    85
 
 //Curl test
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    86
 
 HAVE_O_NONBLOCK:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    87
 
 //Curl test
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    88
 
@@ -938,11 +938,11 @@
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    89
 
 //Have include HAVE_PWD_H
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    90
 
 HAVE_PWD_H:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    91
 
 //Have symbol RAND_egd
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    92
 
-HAVE_RAND_EGD:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    93
 
+HAVE_RAND_EGD:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    94
 
 //Have symbol RAND_screen
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    95
 
 HAVE_RAND_SCREEN:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    96
 
 //Have symbol RAND_status
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    97
 
-HAVE_RAND_STATUS:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    98
 
+HAVE_RAND_STATUS:INTERNAL=
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    99
 
 //Have symbol select
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
   100
 
 HAVE_SELECT:INTERNAL=1
6ca02fd5a199 7053567 Move cmake from SFW to Userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
   101
 
 //Have symbol setgroups
upstream/oracle/userland-gate