From 541635c67542a7f894959fc7c46ec3d75257bad7 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Wed, 15 Apr 2015 15:58:34 +0000 Subject: [PATCH] h2o: update to 1.2.0. --- srcpkgs/h2o/patches/x-compile.patch | 24 ++++++++++++++++++++++++ srcpkgs/h2o/template | 7 ++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/h2o/patches/x-compile.patch diff --git a/srcpkgs/h2o/patches/x-compile.patch b/srcpkgs/h2o/patches/x-compile.patch new file mode 100644 index 0000000000..c9394af55a --- /dev/null +++ b/srcpkgs/h2o/patches/x-compile.patch @@ -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")) diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 97fad67621..51ff0353fd 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -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 " license="MIT" homepage="https://github.com/h2o/h2o" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=381b430cb92b7a5993be1e3f07ea7b7fef1018f01d4e337b68c7b57813516de7 +checksum=09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f post_install() { vsv h2o