aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2012-05-28 09:54:18 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 08:55:33 -0500
commit4ff631ec0a3a1a336f9d5c328ca4c166f0b4ebc6 (patch)
treebfb25c716214505a974dc28efd17c3e37c9b7683
parentc983442ea0b7d411d6e3e1dfee0c1117d281fa41 (diff)
libraries/libev: Updated for version 4.11.
This commit also moves the event.h header into /usr/include/libev/ to avoid conflicts with libevent (shouldn't break anything on SBo). Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--libraries/libev/README7
-rw-r--r--libraries/libev/libev.SlackBuild9
-rw-r--r--libraries/libev/libev.info6
3 files changed, 16 insertions, 6 deletions
diff --git a/libraries/libev/README b/libraries/libev/README
index ba522d4f7a92..f7826e9dd53d 100644
--- a/libraries/libev/README
+++ b/libraries/libev/README
@@ -5,5 +5,8 @@ module, but is faster, scales better and is more correct, and also
more featureful. And also smaller. Yay.
Note: libev and libevent both have a usr/include/event.h
-header file. This could lead to compile problems if both
-packages are installed at the same time.
+header file. This could have lead to compile problems if both
+packages were installed at the same time, so it has been moved to
+usr/include/libev/event.h. Add CPPFLAGS="-I/usr/include/libev" to
+the SlackBuild if the software you're building over this needs the
+libevent compatibility layer (lighttpd2 and i3 don't).
diff --git a/libraries/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild
index 7090dcae37fc..c994d97a62f2 100644
--- a/libraries/libev/libev.SlackBuild
+++ b/libraries/libev/libev.SlackBuild
@@ -4,7 +4,7 @@
# Written by Šime Ramov <s@ramov.com>
PRGNAM=libev
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-4.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -63,6 +63,13 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
+# avoid conflicting with libevent, we move an header in a subfolder
+# and we will explicitly add CPPFLAGS="-I/usr/include/libev" when
+# building software depending on this, if needed: lighttpd2 and i3,
+# for example, don't need this header.
+mkdir -p $PKG/usr/include/libev
+mv $PKG/usr/include/event.h $PKG/usr/include/libev/
+
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/libraries/libev/libev.info b/libraries/libev/libev.info
index 1cb58f493563..11aad4e126c3 100644
--- a/libraries/libev/libev.info
+++ b/libraries/libev/libev.info
@@ -1,8 +1,8 @@
PRGNAM="libev"
-VERSION="3.9"
+VERSION="4.11"
HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-3.9.tar.gz"
-MD5SUM="40fe7d56d70db83cc0c22a6a68d87a96"
+DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.11.tar.gz"
+MD5SUM="cda69b858a1849dfe6ce17c930cf10cd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""