From 27566510bdf6778ee41f90146e3e330a68b7e0b7 Mon Sep 17 00:00:00 2001 From: idriskalp Date: Fri, 27 Dec 2019 13:15:30 +0300 Subject: [PATCH] snappy 1.1.7 --- system/base/snappy/actions.py | 22 +++++++++++++--------- system/base/snappy/files/snappy.pc | 10 ++++++++++ system/base/snappy/pspec.xml | 18 +++++++++++++++--- 3 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 system/base/snappy/files/snappy.pc diff --git a/system/base/snappy/actions.py b/system/base/snappy/actions.py index 15bc60f3..3bd5d08a 100644 --- a/system/base/snappy/actions.py +++ b/system/base/snappy/actions.py @@ -7,24 +7,28 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import cmaketools from pisi.actionsapi import get def setup(): pisitools.flags.remove("-DNDEBUG") - shelltools.system("./autogen.sh") - autotools.configure("--prefix=/usr \ - --disable-static \ - --enable-shared") + #shelltools.system("./autogen.sh") + #autotools.configure("--prefix=/usr \ + #--disable-static \ + #--enable-shared") - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + + cmaketools.configure("-DBUILD_SHARED_LIBS=ON \ + -DCMAKE_INSTALL_LIBDIR=lib") def build(): - autotools.make() + cmaketools.make() -def build(): - autotools.make("check") +def check(): + cmaketools.make("test") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("README", "COPYING", "ChangeLog", "NEWS", "AUTHORS") \ No newline at end of file + pisitools.dodoc("README.md", "COPYING", "AUTHORS") \ No newline at end of file diff --git a/system/base/snappy/files/snappy.pc b/system/base/snappy/files/snappy.pc new file mode 100644 index 00000000..09a56006 --- /dev/null +++ b/system/base/snappy/files/snappy.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: snappy +Description: A fast compression/decompression library +Version: 1.1.7 +Libs: -L${libdir} -lsnappy +Cflags: -I${includedir} diff --git a/system/base/snappy/pspec.xml b/system/base/snappy/pspec.xml index b56d3d65..5daea8b8 100644 --- a/system/base/snappy/pspec.xml +++ b/system/base/snappy/pspec.xml @@ -15,10 +15,11 @@ lzo-devel zlib-devel + cmake - https://github.com/google/snappy/releases/download/1.1.3/snappy-1.1.3.tar.gz + https://github.com/google/snappy/archive/1.1.7.tar.gz - snappy-unittest.patch + @@ -37,11 +38,22 @@ snappy + + snappy.pc + - /usr/include + /usr/lib/pkgconfig + /usr/include + + 2019-12-27 + 1.1.7 + Version bump + idris Kalp + idriskalp@gmail.com + 2018-07-15 1.1.3