Changeset 10673
- Timestamp:
- 2008-03-27T19:11:37+01:00 (10 years ago)
- Location:
- packages/net/vtun
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
packages/net/vtun/Makefile
r9974 r10673 10 10 11 11 PKG_NAME:=vtun 12 PKG_VERSION:= 2.612 PKG_VERSION:=3.0.1 13 13 PKG_RELEASE:=1 14 14 15 15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 16 16 PKG_SOURCE_URL:=@SF/vtun 17 PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf 18 19 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 17 PKG_MD5SUM:=c342ffe77055d4248a38f0b380f28c1b 20 18 21 19 include $(INCLUDE_DIR)/package.mk … … 36 34 define Build/Configure 37 35 $(call Build/Configure/Default, \ 36 --with-lzo-headers="$(STAGING_DIR)/usr/include/lzo" \ 37 --with-lzo-lib="$(STAGING_DIR)/usr/lib/" \ 38 --with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \ 38 39 , \ 39 40 LIBS="-L$(STAGING_DIR)/usr/lib" \ -
packages/net/vtun/patches/100-lzo2.patch
r6500 r10673 1 diff -ur vtun.old/configure vtun.dev/configure 2 --- vtun.old/configure 2002-12-20 18:22:15.000000000 +0100 3 +++ vtun.dev/configure 2006-09-29 21:06:09.000000000 +0200 4 @@ -2001,14 +2001,14 @@ 5 CPPFLAGS="$CPPFLAGS -I$p" 1 diff -urN vtun-3.0.1/configure vtun-3.0.1.new/configure 2 --- vtun-3.0.1/configure 2006-12-11 08:55:06.000000000 +0100 3 +++ vtun-3.0.1.new/configure 2008-03-27 19:10:22.000000000 +0100 4 @@ -5459,7 +5459,7 @@ 6 5 fi 7 echo "$ac_t""($dir) yes " 1>&6 8 - echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6 9 -echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5 10 + echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6 11 +echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5 12 ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'` 13 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 14 echo $ac_n "(cached) $ac_c" 1>&6 15 else 16 ac_save_LIBS="$LIBS" 17 -LIBS="-llzo $LIBS" 18 +LIBS="-llzo2 $LIBS" 19 cat > conftest.$ac_ext <<EOF 20 #line 2014 "configure" 21 #include "confdefs.h" 22 @@ -2037,7 +2037,7 @@ 23 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 24 echo "$ac_t""yes" 1>&6 25 26 - LIBS="$LIBS -llzo" 27 + LIBS="$LIBS -llzo2" 28 cat >> confdefs.h <<\EOF 29 #define HAVE_LZO 1 30 EOF 31 diff -ur vtun.old/lfd_lzo.c vtun.dev/lfd_lzo.c 32 --- vtun.old/lfd_lzo.c 2002-04-25 11:19:50.000000000 +0200 33 +++ vtun.dev/lfd_lzo.c 2006-09-29 21:09:14.000000000 +0200 34 @@ -36,6 +36,7 @@ 35 #ifdef HAVE_LZO 6 echo "$as_me:$LINENO: result: ($dir) yes " >&5 7 echo "${ECHO_T}($dir) yes " >&6 8 - LZOCHK="lzo2 lzo" 9 + LZOCHK="lzo2" 10 else 11 echo "$as_me:$LINENO: result: \"no\"" >&5 12 echo "${ECHO_T}\"no\"" >&6 13 @@ -5504,8 +5504,7 @@ 14 echo "$as_me:$LINENO: result: \"no\"" >&5 15 echo "${ECHO_T}\"no\"" >&6 16 { { echo "$as_me:$LINENO: error: LZO library not found. " >&5 17 -echo "$as_me: error: LZO library not found. " >&2;} 18 - { (exit 1); exit 1; }; } 19 +echo "$as_me: error: LZO library not found. " >&2;} } 36 20 37 #include "lzo1x.h" 38 +#include "lzoutil.h" 21 fi 39 22 40 static lzo_byte *zbuf; 41 static lzo_voidp wmem; 23 @@ -5598,13 +5597,11 @@ 24 done 25 if test $havelzo = 0; then 26 { { echo "$as_me:$LINENO: error: LZO library not found. " >&5 27 -echo "$as_me: error: LZO library not found. " >&2;} 28 - { (exit 1); exit 1; }; } 29 +echo "$as_me: error: LZO library not found. " >&2;} } 30 fi 31 else 32 { { echo "$as_me:$LINENO: error: LZO headers not found. " >&5 33 -echo "$as_me: error: LZO headers not found. " >&2;} 34 - { (exit 1); exit 1; }; } 35 +echo "$as_me: error: LZO headers not found. " >&2;} } 36 fi 37 fi 38
Note: See TracChangeset
for help on using the changeset viewer.