accelio: 1.3 -> 1.4

This commit is contained in:
William A. Kennington III 2015-06-24 17:49:48 -07:00
parent bc4b46c142
commit 42bd1dc12f
2 changed files with 6 additions and 25 deletions

View File

@ -1,21 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 6ce6b6b..72d2e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,14 +110,10 @@ AC_MSG_RESULT([$enable_debug])
if test "$enable_debug" = "yes"; then
AC_DEFINE([DEBUG],[],[Debug Mode])
- AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wdeclaration-after-statement \
- -Wsign-compare -Wc++-compat \
- -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
+ AM_CFLAGS="$AM_CFLAGS -g -ggdb -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
else
AC_DEFINE([NDEBUG],[],[No-debug Mode])
- AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wpadded -Wdeclaration-after-statement \
- -Wsign-compare -Wc++-compat \
- -O3 -D_REENTRANT -D_GNU_SOURCE"
+ AM_CFLAGS="$AM_CFLAGS -O3 -D_REENTRANT -D_GNU_SOURCE"
fi
AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,

View File

@ -6,23 +6,25 @@
stdenv.mkDerivation rec {
name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "accelio";
repo = "accelio";
rev = "v${version}";
sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c";
sha256 = "0cxiwn63481m88zisd0pqs6g0h5k1amz2kidwyxkdbl6xgf70cwd";
};
patches = [ ./cflags.patch ];
postPatch = ''
# Don't build broken examples
sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
# Allow the installation of xio kernel headers
sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
# Don't install ldconfig entries
sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am
sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
'';
nativeBuildInputs = [ autoreconfHook ];