Ошибка компиляции с модулем кеширования

[Igor Sysoev]

On Fri, May 22, 2009 at 12:33:45PM +0200, Alrond wrote:

> 21 мая 2009 г. 19:42 пользователь Igor Sysoev <is at rambler-co.ru> написал:
> 
> > Что показывает configure в районе
> >
> > checking for dlopen()
> >
> > ?
> 
> checking for memalign() ... found
> checking for sched_yield() ... found
> checking for dlopen() ... not found
> checking for dlopen() in libdl ... found
> checking for mmap(MAP_ANON|MAP_SHARED) ... found
> checking for mmap("/dev/zero", MAP_SHARED) ... found

Прилагаемый патч должен исправить эту ошибку, а заодно должен правильнее
собирать OpenSSL из исходников.


-- 
Игорь Сысоев
http://sysoev.ru
-------------- next part --------------
Index: auto/lib/openssl/conf
===================================================================
--- auto/lib/openssl/conf	(revision 2192)
+++ auto/lib/openssl/conf	(revision 2196)
@@ -25,19 +25,14 @@
             have=NGX_OPENSSL . auto/have
             have=NGX_SSL . auto/have
 
-            CORE_INCS="$CORE_INCS $OPENSSL/include"
-            LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
-            CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
-        ;;
-    esac
-
-    case "$NGX_SYSTEM" in
-        SunOS|Linux)
+            CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
+            CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a"
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a"
             CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
         ;;
     esac
 
-
 else
 
     case "$NGX_PLATFORM" in
@@ -69,14 +64,8 @@
 
             if [ $ngx_found = yes ]; then
                 have=NGX_SSL . auto/have
-                CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+                CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
                 OPENSSL=YES
-
-                case "$NGX_SYSTEM" in
-                    SunOS)
-                        CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
-                    ;;
-                esac
             fi
         ;;
 
Index: auto/lib/openssl/make
===================================================================
--- auto/lib/openssl/make	(revision 2192)
+++ auto/lib/openssl/make	(revision 2196)
@@ -2,15 +2,9 @@
 # Copyright (C) Igor Sysoev
 
 
-if test -n "$OPENSSL_OPT"; then
-    NGX_OPENSSL_CONFIG="./Configure $OPENSSL_OPT"
-else
-    NGX_OPENSSL_CONFIG="./config"
-fi
-
 case $USE_THREADS in
-    NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;;
-    *)  NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;;
+    NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
+    *)  OPENSSL_OPT="$OPENSSL_OPT threads" ;;
 esac
 
 case "$CC" in
@@ -53,11 +47,12 @@
     *)
         cat << END                                            >> $NGX_MAKEFILE
 
-$OPENSSL/libssl.a:	$NGX_MAKEFILE
+$OPENSSL/openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	cd $OPENSSL \\
 	&& \$(MAKE) clean \\
-	&& $NGX_OPENSSL_CONFIG no-shared \\
-	&& \$(MAKE)
+	&& ./config --prefix=$PWD/$OPENSSL/openssl no-shared $OPENSSL_OPT \\
+	&& \$(MAKE) \\
+	&& \$(MAKE) install
 
 END