OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jul-2005 11:16:43
Branch: HEAD Handle: 2005070710164102
Modified files:
openpkg-src/gnutls gnutls.patch gnutls.spec
Log:
add zlib support and fix zlib/lzo build-time
Summary:
Revision Changes Path
1.11 +29 -0 openpkg-src/gnutls/gnutls.patch
1.64 +6 -3 openpkg-src/gnutls/gnutls.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnutls/gnutls.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 gnutls.patch
--- openpkg-src/gnutls/gnutls.patch 2 Aug 2004 17:29:47 -0000 1.10
+++ openpkg-src/gnutls/gnutls.patch 7 Jul 2005 09:16:41 -0000 1.11
@@ -21,3 +21,32 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
+Index: configure
+--- configure.orig 2005-04-04 17:37:00 +0200
++++ configure 2005-07-07 10:47:55 +0200
+@@ -12196,7 +12196,7 @@
+ # Check whether --with-lzo or --without-lzo was given.
+ if test "${with_lzo+set}" = set; then
+ withval="$with_lzo"
+- use_lzo=no
++ use_lzo=$withval
+ else
+ use_lzo=yes
+ fi;
+Index: libextra/lzoconf.h
+--- libextra/lzoconf.h.orig 2005-01-27 14:16:12 +0100
++++ libextra/lzoconf.h 2005-07-07 11:11:30 +0200
+@@ -408,11 +408,11 @@
+ * lzo_init() is a macro to allow checking that the library and the
+ * compiler's view of various types are consistent.
+ */
+-#define lzo_init()
__lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
++#define lzo_init()
__lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
+ (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
+ (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
+ (int)sizeof(lzo_compress_t))
+- LZO_EXTERN(int) __lzo_init2(unsigned, int, int, int, int, int, int,
++ LZO_EXTERN(int) __lzo_init_v2(unsigned, int, int, int, int, int, int,
+ int, int, int);
+
+ /* version functions (useful for shared libraries) */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnutls/gnutls.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 gnutls.spec
--- openpkg-src/gnutls/gnutls.spec 8 Apr 2005 09:34:27 -0000 1.63
+++ openpkg-src/gnutls/gnutls.spec 7 Jul 2005 09:16:43 -0000 1.64
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 1.2.1
-Release: 20050408
+Release: 20050707
# list of sources
Source0: ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.bz2
@@ -44,8 +44,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: gcrypt >= 1.1.94, opencdk >= 0.5.2, libtasn1, lzo, getopt
-PreReq: gcrypt >= 1.1.94, opencdk >= 0.5.2, libtasn1, lzo, getopt
+BuildPreReq: gcrypt >= 1.1.94, opencdk >= 0.5.2, libtasn1, lzo, zlib, getopt
+PreReq: gcrypt >= 1.1.94, opencdk >= 0.5.2, libtasn1, lzo, zlib, getopt
AutoReq: no
AutoReqProv: no
@@ -82,6 +82,9 @@
--prefix=%{l_prefix} \
--with-libgcrypt-prefix=%{l_prefix} \
--with-libopencdk-prefix=%{l_prefix} \
+ --with-zlib \
+ --with-lzo \
+ --without-included-lzo \
--disable-shared
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
