فهرست منبع

upgrade to cURL 7.10.2 (required zlib)

Ralf S. Engelschall 23 سال پیش
والد
کامیت
f983ed5e06
1فایلهای تغییر یافته به همراه20 افزوده شده و 15 حذف شده
  1. 20 15
      openpkg/openpkg.spec

+ 20 - 15
openpkg/openpkg.spec

@@ -39,15 +39,15 @@
 #   o any cc(1)
 #   o any cc(1)
 
 
 #   the package version and release
 #   the package version and release
-%define       V_openpkg 20021118
-%define       R_openpkg 20021118
+%define       V_openpkg 20021119
+%define       R_openpkg 20021119
 
 
 #   the used software versions
 #   the used software versions
 %define       V_rpm     4.0.2
 %define       V_rpm     4.0.2
 %define       V_zlib    1.1.4
 %define       V_zlib    1.1.4
 %define       V_bzip2   1.0.2
 %define       V_bzip2   1.0.2
 %define       V_db      3.2.9
 %define       V_db      3.2.9
-%define       V_curl    7.10.1
+%define       V_curl    7.10.2
 %define       V_make    3.80
 %define       V_make    3.80
 %define       V_gzip    1.3.5
 %define       V_gzip    1.3.5
 %define       V_patch   2.5.4
 %define       V_patch   2.5.4
@@ -382,30 +382,35 @@ Provides:     OpenPKG
       (mv src/tar ..; ${l_make} clean || true; mv ../tar src/)
       (mv src/tar ..; ${l_make} clean || true; mv ../tar src/)
     )
     )
 
 
+    #   build BZIP2 library
+    ( cd bzip2-%{V_bzip2}
+      ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
+    )
+
+    #   build ZLIB library
+    ( cd zlib-%{V_zlib}
+      CC="${l_cc}" CFLAGS="-O" ./configure
+      ${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
+    )
+
     #   build cURL tool
     #   build cURL tool
     ( cd curl-%{V_curl}
     ( cd curl-%{V_curl}
+      echo 'ac_cv_header_openssl_engine_h=no' >config.cache
       CC="${l_cc}" \
       CC="${l_cc}" \
+      CFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
+      CPPFLAGS="-I`pwd`/../zlib-%{V_zlib}" \
+      LDFLAGS="-L`pwd`/../zlib-%{V_zlib}" \
       ./configure \
       ./configure \
+          --cache-file=config.cache \
           --without-ssl \
           --without-ssl \
           --disable-shared \
           --disable-shared \
           --disable-thread \
           --disable-thread \
           --disable-ipv6 \
           --disable-ipv6 \
-          --without-zlib
+          --with-zlib=`pwd`/../zlib-%{V_zlib}
       ${l_make} || exit $?
       ${l_make} || exit $?
       (mv src/curl ..; ${l_make} clean || true; mv ../curl ./src)
       (mv src/curl ..; ${l_make} clean || true; mv ../curl ./src)
     )
     )
 
 
-    #   build BZIP2 library
-    ( cd bzip2-%{V_bzip2}
-      ${l_make} CC="${l_cc}" CFLAGS="-O" libbz2.a bzip2 || exit $?
-    )
-
-    #   build ZLIB library
-    ( cd zlib-%{V_zlib}
-      CC="${l_cc}" CFLAGS="-O" ./configure
-      ${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
-    )
-
     #   build Berkeley-DB library
     #   build Berkeley-DB library
     ( cd db-%{V_db}/build_unix
     ( cd db-%{V_db}/build_unix
       case `sh ../dist/config.guess` in
       case `sh ../dist/config.guess` in