diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2013-12-20 20:25:44 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2013-12-20 20:25:44 +0000 |
| commit | 72f00c8de440ac3bf3c373c107e7555182f9fafb (patch) | |
| tree | 662574d976283456f538103550874cb89118599a /package/libs/cyassl | |
| parent | 41cbd0a3895faa6f2462f302730cdae8e0779adb (diff) | |
| download | upstream-72f00c8de440ac3bf3c373c107e7555182f9fafb.tar.gz upstream-72f00c8de440ac3bf3c373c107e7555182f9fafb.tar.bz2 upstream-72f00c8de440ac3bf3c373c107e7555182f9fafb.zip | |
change fixup method and fix CFLAGS handling
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 39151
Diffstat (limited to 'package/libs/cyassl')
| -rw-r--r-- | package/libs/cyassl/Makefile | 4 | ||||
| -rw-r--r-- | package/libs/cyassl/patches/100-respect_cflags.patch | 11 | ||||
| -rw-r--r-- | package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile index df8335e800..3b8f88b750 100644 --- a/package/libs/cyassl/Makefile +++ b/package/libs/cyassl/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cyassl PKG_VERSION:=2.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://www.yassl.com/ PKG_MD5SUM:=7465d4815af90eff01095fa1b031ce09 -PKG_FIXUP:=patch-libtool +PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/package/libs/cyassl/patches/100-respect_cflags.patch b/package/libs/cyassl/patches/100-respect_cflags.patch new file mode 100644 index 0000000000..db6c3ab723 --- /dev/null +++ b/package/libs/cyassl/patches/100-respect_cflags.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ AC_SUBST([CYASSL_LIBRARY_VERSION]) + + # capture user C_EXTRA_FLAGS from ./configure line, CFLAGS may hold -g -O2 even + # if user doesn't override, no way to tell +-USER_C_EXTRA_FLAGS="$C_EXTRA_FLAGS" ++USER_C_EXTRA_FLAGS="$CFLAGS" + + LT_PREREQ([2.2]) + LT_INIT([disable-static],[win32-dll]) diff --git a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch index d46f549a5d..d28f4d38a1 100644 --- a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch +++ b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch @@ -1,6 +1,6 @@ --- a/src/internal.c +++ b/src/internal.c -@@ -4622,6 +4622,10 @@ +@@ -4622,6 +4622,10 @@ int ProcessReply(CYASSL* ssl) b1 = ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++]; ssl->curSize = ((b0 & 0x7f) << 8) | b1; |