h2o: update to 1.5.0.

This commit is contained in:
Juan RP 2015-10-06 08:44:46 +02:00
parent afdd06b56d
commit f3ca3b52b0
2 changed files with 4 additions and 28 deletions

View file

@ -1,24 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe507e9ec25c..91f45a301304 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -19,11 +19,15 @@ SET(WITH_BUNDLED_SSL_DEFAULT "ON")
IF ((NOT UNIX) OR CYGWIN)
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
ENDIF ((NOT UNIX) OR CYGWIN)
-STRING(REGEX MATCH "^(amd64|AMD64|x86_64|x86||i[3456]86)$" PROC_MATCH ${CMAKE_SYSTEM_PROCESSOR})
-IF (NOT PROC_MATCH)
- MESSAGE("target processor ${CMAKE_SYSTEM_PROCESSOR} is not x86")
+IF (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "")
+ STRING(REGEX MATCH "^(amd64|AMD64|x86_64|x86||i[3456]86)$" PROC_MATCH ${CMAKE_SYSTEM_PROCESSOR})
+ IF (NOT PROC_MATCH)
+ MESSAGE("target processor ${CMAKE_SYSTEM_PROCESSOR} is not x86")
+ SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
+ ENDIF (NOT PROC_MATCH)
+ELSE ()
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
-ENDIF (NOT PROC_MATCH)
+ENDIF ()
IF (OPENSSL_FOUND AND NOT (OPENSSL_VERSION VERSION_LESS "1.0.2"))
SET(WITH_BUNDLED_SSL_DEFAULT "OFF")
ENDIF (OPENSSL_FOUND AND NOT (OPENSSL_VERSION VERSION_LESS "1.0.2"))

View file

@ -1,20 +1,20 @@
# Template file for 'h2o'
pkgname=h2o
version=1.4.5
version=1.5.0
revision=1
build_style=cmake
conf_files="/etc/h2o.conf"
system_accounts="h2o"
make_dirs="/var/log/h2o 0750 root root"
hostmakedepends="cmake"
makedepends="libressl-devel"
hostmakedepends="cmake pkg-config"
makedepends="zlib-devel libressl-devel"
depends="perl"
short_desc="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="MIT"
homepage="https://github.com/h2o/h2o"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=0f60e8d35afad61afc284a7abfa9c9a3b976e8f9faed3f0966fb34056e2e138d
checksum=b0700b30e26852d6dca2fc72d3f742ab8a0694ae7e1871e33b0cfb5ce1bdde7e
post_install() {
vsv h2o