summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Sarawinski2019-04-01 13:02:44 +0200
committerTimo Sarawinski2019-04-01 13:02:44 +0200
commit9d54d47be8bcf34b8e099194e04c7bbd4355db99 (patch)
treee6ac0bc97b526865c17b7bfb5ef559c3be392ca9
parent9c09dad8ea91bad9d61425d215418e5c536bff43 (diff)
downloadaur-9d54d47be8bcf34b8e099194e04c7bbd4355db99.tar.gz
fix build
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
-rw-r--r--logging.patch11
-rw-r--r--sysmacros_h.patch62
4 files changed, 89 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f92200532d5..8b1bc33e063 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = e4rat
pkgdesc = Toolset to accelerate the boot process and application startups for systems with ext4 root partitions.
pkgver = 0.2.3
- pkgrel = 2
+ pkgrel = 3
url = http://e4rat.sourceforge.net/
arch = i686
arch = x86_64
@@ -14,8 +14,12 @@ pkgbase = e4rat
options = !strip
backup = etc/e4rat.conf
source = http://downloads.sourceforge.net/project/e4rat/0.2.3/e4rat_0.2.3_src.tar.gz
+ source = logging.patch
+ source = sysmacros_h.patch
source = boost-fs3-v2.patch
sha256sums = f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0
+ sha256sums = d54959ea7fb0629de51f6b530ee72082863756bbe0b0b5af0965aa5ad9ac9739
+ sha256sums = ea35d1f7f8b6c4be9f20cc6ffbe72446dbdb6b99df450f29855a1cf9cf79362a
sha256sums = 9a9786d6167e4a47d1733735745b0eadeabf487886405df9e6771a28f3a20965
pkgname = e4rat
diff --git a/PKGBUILD b/PKGBUILD
index c05d5f42528..09b795e07b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
# Maintainer: Swift Geek <swiftgeek «at» gmail>
# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
# Contributor: graysky <graysky AT archlinux DOT us>
+# Contributor: muhviehstarr <timo@it-kraut.net>
pkgname=e4rat
pkgver=0.2.3
-pkgrel=2
+pkgrel=3
pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions."
arch=('i686' 'x86_64')
url="http://e4rat.sourceforge.net/"
@@ -14,19 +15,21 @@ makedepends=('audit' 'boost' 'cmake')
options=(!strip)
backup=(etc/e4rat.conf)
source=( "http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz" \
+ 'logging.patch' \
+ 'sysmacros_h.patch' \
'boost-fs3-v2.patch' )
prepare () {
cd "$srcdir/$pkgname-$pkgver"
patch -p1 < "$srcdir/boost-fs3-v2.patch"
+ patch -p0 -i ../logging.patch
+ patch -p0 -i ../sysmacros_h.patch
}
build() {
cd "$srcdir/$pkgname-$pkgver"
-
- unset LDFLAGS
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CORE_LIBRARY_STATIC=true .
- make
+ make
}
package() {
@@ -36,4 +39,7 @@ package() {
install -dm755 "$pkgdir/var/lib/$pkgname"
}
-sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0' '9a9786d6167e4a47d1733735745b0eadeabf487886405df9e6771a28f3a20965')
+sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0'
+ 'd54959ea7fb0629de51f6b530ee72082863756bbe0b0b5af0965aa5ad9ac9739'
+ 'ea35d1f7f8b6c4be9f20cc6ffbe72446dbdb6b99df450f29855a1cf9cf79362a'
+ '9a9786d6167e4a47d1733735745b0eadeabf487886405df9e6771a28f3a20965')
diff --git a/logging.patch b/logging.patch
new file mode 100644
index 00000000000..f844e63e95c
--- /dev/null
+++ b/logging.patch
@@ -0,0 +1,11 @@
+--- src/logging.hh
++++ src/logging.hh
+@@ -93,7 +93,7 @@
+ #define dump_log(...) logger.write(__VA_ARGS__)
+
+ #ifdef DEBUG_ENABLED
+- #define debug(format,args...) dump_log(Debug, "%s:%d in %s(): "format, __FILE__, __LINE__, __FUNCTION__, ## args)
++ #define debug(format, ...) logger.write(Debug, "%s:%d in %s(): " format, __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)
+ #else
+ #define debug(format,args...)
+ #endif
diff --git a/sysmacros_h.patch b/sysmacros_h.patch
new file mode 100644
index 00000000000..d3ed4c4fcf9
--- /dev/null
+++ b/sysmacros_h.patch
@@ -0,0 +1,62 @@
+diff -Naur -b '--to-file=e4rat-lite-patched/src/' -x '*.o' -x '*.tu' e4rat-lite/src/device.cc e4rat-lite-patched/src/device.cc
+--- src/device.cc
++++ src/device.cc
+@@ -32,6 +32,8 @@
+
+ #include <boost/lexical_cast.hpp>
+
++#include <sys/sysmacros.h>
++
+ #define BLOCKS_PER_GROUP(fs) (fs->super->s_blocks_per_group)
+ #define BLOCKS_PER_FLEX(fs) (BLOCKS_PER_GROUP(fs) << fs->super->s_log_groups_per_flex)
+ #define FREE_BLOCKS_PER_GROUP(fs) ( BLOCKS_PER_GROUP(fs) \
+
+diff -Naur -b '--to-file=e4rat-lite-patched/src/' -x '*.o' -x '*.tu' e4rat-lite/src/e4rat-collect.cc e4rat-lite-patched/src/e4rat-collect.cc
+--- src/e4rat-collect.cc
++++ src/e4rat-collect.cc
+@@ -45,6 +45,9 @@
+
+ #include <boost/foreach.hpp>
+
++#include <sys/sysmacros.h>
++
++
+ #define PID_FILE "/dev/.e4rat-collect.pid"
+
+ bool isAuditDaemonRunning()
+
+--- src/listener.cc
++++ src/listener.cc
+@@ -43,6 +43,8 @@
+
+ #include <fstream>
+
++#include <sys/sysmacros.h>
++
+ std::string getProcessName(pid_t pid)
+ {
+ std::string comm;
+--- src/cmake/Findaudit.cmake
++++ src/cmake/Findaudit.cmake
+@@ -1,7 +1,7 @@
+ FIND_PATH(AUDIT_INCLUDE_DIR libaudit.h /usr/include
+ /usr/local/include)
+
+-FIND_LIBRARY(AUDIT_LIBRARY NAMES libaudit.a PATH /usr/lib /usr/local/lib)
++FIND_LIBRARY(AUDIT_LIBRARY NAMES audit PATH /usr/lib /usr/local/lib)
+
+ IF (AUDIT_INCLUDE_DIR AND AUDIT_LIBRARY)
+ SET(AUDIT_FOUND TRUE)
+
+--- src/cmake/Findauparse.cmake
++++ src/cmake/Findauparse.cmake
+@@ -1,7 +1,7 @@
+ FIND_PATH(AUPARSE_INCLUDE_DIR auparse.h /usr/include
+ /usr/local/include)
+
+-FIND_LIBRARY(AUPARSE_LIBRARY NAMES libauparse.a PATH /usr/lib /usr/local/lib)
++FIND_LIBRARY(AUPARSE_LIBRARY NAMES auparse PATH /usr/lib /usr/local/lib)
+
+ IF (AUPARSE_INCLUDE_DIR AND AUPARSE_LIBRARY)
+ SET(AUPARSE_FOUND TRUE)
+