summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD32
2 files changed, 18 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 85469cf1e47c..c21ec939de55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = websocketpp-git
pkgdesc = C++/Boost Asio based websocket client/server library
- pkgver = 0.6.0.1461.c5510d6
+ pkgver = 0.8.2.1709.1b11fd3
pkgrel = 1
url = http://www.zaphoyd.com/websocketpp/
arch = any
@@ -9,7 +9,6 @@ pkgbase = websocketpp-git
makedepends = cmake
makedepends = boost
makedepends = boost-libs
- makedepends = scons
optdepends = openssl: TLS socket component support
optdepends = asio: alternative asio transport support
optdepends = boost: non C++11 environments support
diff --git a/PKGBUILD b/PKGBUILD
index 81901c46904e..caa7edbfe440 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=websocketpp-git
_gitname=websocketpp
-pkgver=0.6.0.1461.c5510d6
+pkgver=0.8.2.1709.1b11fd3
pkgrel=1
pkgdesc='C++/Boost Asio based websocket client/server library'
url='http://www.zaphoyd.com/websocketpp/'
@@ -14,7 +14,7 @@ optdepends=(
'boost: non C++11 environments support'
'boost-libs: non C++11 environments support'
)
-makedepends=('git' 'cmake' 'boost' 'boost-libs' 'scons')
+makedepends=('git' 'cmake' 'boost' 'boost-libs')
provides=('websocketpp')
conflicts=('websocketpp')
source=(${pkgname}::git+https://github.com/zaphoyd/${_gitname})
@@ -26,30 +26,32 @@ pkgver() {
"$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
+prepare() {
+ cd ${pkgname}
+ sed 's|"${WEBSOCKETPP_BOOST_LIBS}"|${WEBSOCKETPP_BOOST_LIBS}|g' -i CMakeLists.txt
+}
+
build() {
cd ${pkgname}
- WSPP_ENABLE_CPP11=1 \
- BOOST_LIBS=/usr/lib \
- BOOST_INCLUDES=/usr/include/boost \
- scons "${MAKEFLAGS}"
- (cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
- )
+ cmake \
+ -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DENABLE_CPP11=ON \
+ -DBUILD_TESTS=ON
+ make -C build
}
check() {
cd ${pkgname}
- WSPP_ENABLE_CPP11=1 \
- BOOST_LIBS=/usr/lib \
- BOOST_INCLUDES=/usr/include/boost \
- scons test
+ make -C build test
}
package() {
cd ${pkgname}
make -C build DESTDIR="${pkgdir}" install
- install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm 644 readme.md "${pkgdir}/usr/share/doc/${pkgname}/README"
+ install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm 644 readme.md -T "${pkgdir}/usr/share/doc/${pkgname}"
}
# vim: ts=2 sw=2 et: