components/cmake/patches-post-config/CmakeCache-txt.patch
author Tomas Dzik <Tomas.Dzik@oracle.com>
Tue, 27 Mar 2012 06:39:39 -0700
branchs11-sru
changeset 2259 fb408bde6228
parent 312 6ca02fd5a199
permissions -rw-r--r--
7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22

diff -u ./CMakeCache.txt ./CMakeCache.txt
--- ./CMakeCache.txt	Wed Jun  1 11:23:27 2011
+++ ./CMakeCache.txt.new	Wed Jun  1 11:23:28 2011
@@ -435,7 +435,7 @@
 cmcompress_LIB_DEPENDS:STATIC=
 
 //Dependencies for the target
-cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;crypto;general;ssl;general;idn;general;cmzlib;
+cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;idn;general;cmzlib;
 
 //Dependencies for target
 cmexpat_LIB_DEPENDS:STATIC=
@@ -720,7 +720,7 @@
 //Result of TRY_COMPILE
 HAVE_CMEXPAT_BIGENDIAN:INTERNAL=TRUE
 //Have symbol CRYPTO_cleanup_all_ex_data
-HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=1
+HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=
 //Have include HAVE_CTYPE_H
 HAVE_CTYPE_H:INTERNAL=1
 //Have include HAVE_DIRENT_H
@@ -729,7 +729,7 @@
 HAVE_DIRNAME:INTERNAL=1
 //Have include HAVE_DLFCN_H
 HAVE_DLFCN_H:INTERNAL=1
-//Have library dl;socket;nsl;crypto;ssl;idn
+//Have library dl;socket;nsl;idn
 HAVE_DLOPEN:INTERNAL=1
 //Have include elf.h
 HAVE_ELF_H:INTERNAL=1
@@ -852,19 +852,19 @@
 //Have symbol lchown
 HAVE_LCHOWN:INTERNAL=1
 //Have library crypto;dl;socket;nsl
-HAVE_LIBCRYPTO:INTERNAL=1
+HAVE_LIBCRYPTO:INTERNAL=
 //Have library dl;
 HAVE_LIBDL:INTERNAL=1
 //Have include HAVE_LIBGEN_H
 HAVE_LIBGEN_H:INTERNAL=1
-//Have library idn;dl;socket;nsl;crypto;ssl
+//Have library idn;dl;socket;nsl
 HAVE_LIBIDN:INTERNAL=1
 //Have library nsl;dl;socket
 HAVE_LIBNSL:INTERNAL=1
 //Have library socket;dl
 HAVE_LIBSOCKET:INTERNAL=1
-//Have library ssl;dl;socket;nsl;crypto
-HAVE_LIBSSL:INTERNAL=1
+//Have library ssl;dl;socket;nsl
+HAVE_LIBSSL:INTERNAL=
 //Have library winmm;dl;socket;nsl
 HAVE_LIBWINMM:INTERNAL=
 //Have library ws2_32;dl;socket;nsl
@@ -898,23 +898,23 @@
 //Have include HAVE_NET_IF_H
 HAVE_NET_IF_H:INTERNAL=1
 //Have include HAVE_OPENSSL_CRYPTO_H
-HAVE_OPENSSL_CRYPTO_H:INTERNAL=1
+HAVE_OPENSSL_CRYPTO_H:INTERNAL=
 //Have include HAVE_OPENSSL_ENGINE_H
-HAVE_OPENSSL_ENGINE_H:INTERNAL=1
+HAVE_OPENSSL_ENGINE_H:INTERNAL=
 //Have include HAVE_OPENSSL_ERR_H
-HAVE_OPENSSL_ERR_H:INTERNAL=1
+HAVE_OPENSSL_ERR_H:INTERNAL=
 //Have include HAVE_OPENSSL_PEM_H
-HAVE_OPENSSL_PEM_H:INTERNAL=1
+HAVE_OPENSSL_PEM_H:INTERNAL=
 //Have include HAVE_OPENSSL_PKCS12_H
-HAVE_OPENSSL_PKCS12_H:INTERNAL=1
+HAVE_OPENSSL_PKCS12_H:INTERNAL=
 //Have include HAVE_OPENSSL_RAND_H
-HAVE_OPENSSL_RAND_H:INTERNAL=1
+HAVE_OPENSSL_RAND_H:INTERNAL=
 //Have include HAVE_OPENSSL_RSA_H
-HAVE_OPENSSL_RSA_H:INTERNAL=1
+HAVE_OPENSSL_RSA_H:INTERNAL=
 //Have include HAVE_OPENSSL_SSL_H
-HAVE_OPENSSL_SSL_H:INTERNAL=1
+HAVE_OPENSSL_SSL_H:INTERNAL=
 //Have include HAVE_OPENSSL_X509_H
-HAVE_OPENSSL_X509_H:INTERNAL=1
+HAVE_OPENSSL_X509_H:INTERNAL=
 //Curl test 
 HAVE_O_NONBLOCK:INTERNAL=1
 //Curl test 
@@ -938,11 +938,11 @@
 //Have include HAVE_PWD_H
 HAVE_PWD_H:INTERNAL=1
 //Have symbol RAND_egd
-HAVE_RAND_EGD:INTERNAL=1
+HAVE_RAND_EGD:INTERNAL=
 //Have symbol RAND_screen
 HAVE_RAND_SCREEN:INTERNAL=
 //Have symbol RAND_status
-HAVE_RAND_STATUS:INTERNAL=1
+HAVE_RAND_STATUS:INTERNAL=
 //Have symbol select
 HAVE_SELECT:INTERNAL=1
 //Have symbol setgroups