diff options
| author | Solomon Choina | 2021-09-27 15:09:12 -0400 |
|---|---|---|
| committer | Solomon Choina | 2021-09-27 15:09:12 -0400 |
| commit | 5572706c03dd48f5eaf82b21b252becfeecfc5e4 (patch) | |
| tree | d4ae12f744bad4a223b8c67603d5abac50c50041 | |
| parent | b986d5eec61ceea57603ae544d0037cc839995f0 (diff) | |
| download | aur-5572706c03dd48f5eaf82b21b252becfeecfc5e4.tar.gz | |
updpkgver and fix stuff
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | fix-meson-no-install.patch | 35 |
2 files changed, 5 insertions, 49 deletions
@@ -1,5 +1,5 @@ # Maintainer: Jianqiu Zhang <void001@archlinuxcn.org> - +# Maintainer: Solomon Choina <shlomochoina@gmail.com> pkgname=oomd-git pkgver=20190207 @@ -16,21 +16,12 @@ source=( "oomd::git+https://github.com/facebookincubator/oomd.git" ) - -prepare() { - echo "Prepare do nothing" -# cp fix-meson-no-install.patch $srcdir/oomd/ -# cd $srcdir/oomd/ -# patch -p1 < fix-meson-no-install.patch -} - build() { - cd $srcdir/oomd - meson --prefix "$pkgdir/usr" build && ninja -C build + arch-meson oomd build + ninja -C build } package() { - cd $srcdir/oomd - ninja -C build install - install -Dm644 $srcdir/oomd/src/oomd/etc/desktop.json $pkgdir/etc/desktop.json.example + DESTDIR=$pkgdir ninja -C build install + install -Dm644 $srcdir/oomd/src/oomd/etc/desktop.json $pkgdir/etc/oomd/desktop.json.example } diff --git a/fix-meson-no-install.patch b/fix-meson-no-install.patch deleted file mode 100644 index 2e67682b4e62..000000000000 --- a/fix-meson-no-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/example/oomd.json b/example/oomd.json -index 664aed5..859f4ba 100644 ---- a/example/oomd.json -+++ b/example/oomd.json -@@ -7,7 +7,7 @@ - {"sshd.service": { "max_usage": "inf" } } - ], - "oomdetector": "default", -- "oomkiller": "fbje" -+ "oomkiller": "default" - }, - { - "target": "workload.slice", -diff --git a/meson.build b/meson.build -index f12f067..2842453 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,14 +39,16 @@ srcs = files(''' - - deps = [dependency('jsoncpp'), - dependency('threads')] --oomd_lib = library('oomd', -+oomd_lib = shared_library('oomd', - srcs, - include_directories : inc, -+ install: true, - dependencies : deps) - executable('oomd_bin', - files('Main.cpp'), - include_directories : inc, - dependencies : deps, -+ install: true, - link_with : oomd_lib) - - gtest_dep = dependency('gtest', main : true, required : false) |