h2o: update to 1.2.0.

This commit is contained in:
Eivind Uggedal 2015-04-15 15:58:34 +00:00
parent 796aa8b375
commit 541635c675
2 changed files with 28 additions and 3 deletions

View file

@ -0,0 +1,24 @@
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,21 @@
# Template file for 'h2o'
pkgname=h2o
version=1.1.1
version=1.2.0
revision=1
build_style=cmake
configure_flags="-DUSE_BUNDLED_SSL=OFF"
conf_files="/etc/h2o.conf"
system_accounts="h2o"
make_dirs="/var/log/h2o 0750 root root"
hostmakedepends="cmake"
makedepends="libressl-devel libyaml-devel"
makedepends="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=381b430cb92b7a5993be1e3f07ea7b7fef1018f01d4e337b68c7b57813516de7
checksum=09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f
post_install() {
vsv h2o