Date: Wednesday, July 20, 2022 @ 10:22:52
Author: dvzrv
Revision: 1254852
upgpkg: libtracefs 1.4.2-1: Upgrade to 1.4.2.
Add patch to insert LDFLAGS when compiling libs and executables.
Also build and install sqlhist: https://bugs.archlinux.org/task/74976
Added:
libtracefs/trunk/libtracefs-1.4.2-ldflags.patch
Modified:
libtracefs/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 18 ++++++++++++------
libtracefs-1.4.2-ldflags.patch | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-20 10:10:12 UTC (rev 1254851)
+++ PKGBUILD 2022-07-20 10:22:52 UTC (rev 1254852)
@@ -2,7 +2,7 @@
pkgbase=libtracefs
pkgname=(libtracefs libtracefs-docs)
-pkgver=1.4.1
+pkgver=1.4.2
pkgrel=1
pkgdesc="Linux kernel trace file system library"
arch=(x86_64)
@@ -14,11 +14,14 @@
source=(
$pkgname-$pkgver.tar.gz::https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/$pkgname-$pkgver.tar.gz
$pkgname-1.2.0-docs_makefile.patch
+ $pkgname-1.4.2-ldflags.patch
)
-sha512sums=('b1e11d7e55d6646daba9eb9eaca5150672a41faa8df2f716dad989b7848ffbd52180b3f3e6df5e80f385f94c55ae2b474b153f60f27ba8eb67e44d125bdecdee'
- 'bdfffba9957d889c60baea9c197709bf1a62d30ac4b8fd47d930b8d5b67fa040817b9a835e226dd1201f2ccdb7fcb43a12093c2b559fb6c0edc3e9ba167062c2')
-b2sums=('a642018c3c2a2915c70d0795f4ee771776f5160368034108624dbe6d23e8aada31f9edbc730260f029a35e2518fbb50f3a7349f899bd188ada32a5eb64db2816'
- '1340af2c65dc344912715c69827d5849fda83e4bcf136da3ccdbee4e3b508e9b557af0828914dff8d27abebbdbdab975d8800432d5252b6b1eb0da08b0cb4b02')
+sha512sums=('4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c'
+ 'bdfffba9957d889c60baea9c197709bf1a62d30ac4b8fd47d930b8d5b67fa040817b9a835e226dd1201f2ccdb7fcb43a12093c2b559fb6c0edc3e9ba167062c2'
+ '6b3ffa2dee59edf1ce376b23f38edb29720c1fced4beae3a2e6d8358430839c929bd52c1a3fa193cd3cc86e128dd9a45d79be3ddfebffe1bae4e690f48403864')
+b2sums=('a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc'
+ '1340af2c65dc344912715c69827d5849fda83e4bcf136da3ccdbee4e3b508e9b557af0828914dff8d27abebbdbdab975d8800432d5252b6b1eb0da08b0cb4b02'
+ '56b7f27ed2913e1c85b133e5ec15f632bcfa54a530149e3b1450cb7bc9b951c1853fad25f9d467772334471986f492baf198710086f1ab2050932c8c7b96af50')
_pick() {
local p="$1" f d; shift
@@ -32,10 +35,12 @@
prepare() {
patch -d $pkgname-$pkgver -Np 1 -i ../$pkgname-1.2.0-docs_makefile.patch
+ patch -d $pkgname-$pkgver -Np 1 -i ../$pkgname-1.4.2-ldflags.patch
}
build() {
- make LDFLAGS="$LDFLAGS" -C $pkgname-$pkgver
+ make -C $pkgname-$pkgver
+ make sqlhist -C $pkgname-$pkgver
make doc -C $pkgname-$pkgver
}
@@ -45,6 +50,7 @@
make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install -C $pkgname-$pkgver
make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install -C $pkgname-$pkgver/Documentation
+ install -vDm 755 $pkgname-$pkgver/bin/sqlhist -t "$pkgdir/usr/bin/"
(
cd "$pkgdir"
Added: libtracefs-1.4.2-ldflags.patch
===================================================================
--- libtracefs-1.4.2-ldflags.patch (rev 0)
+++ libtracefs-1.4.2-ldflags.patch 2022-07-20 10:22:52 UTC (rev 1254852)
@@ -0,0 +1,17 @@
+diff -ruN a/scripts/utils.mk b/scripts/utils.mk
+--- a/scripts/utils.mk 2022-07-14 21:19:15.000000000 +0200
++++ b/scripts/utils.mk 2022-07-20 12:15:20.026783304 +0200
+@@ -101,11 +101,11 @@
+
+ do_sample_build = \
+ $(Q)($(print_sample_build) \
+- $(CC) -o $1 $2 $(CFLAGS) $(LIBTRACEFS_STATIC) $(LIBTRACEEVENT_LIBS))
++ $(CC) -o $1 $2 $(CFLAGS) $(LIBTRACEFS_STATIC) $(LIBTRACEEVENT_LIBS) $(LDFLAGS))
+
+ do_sample_obj = \
+ $(Q)($(print_sample_obj) \
+- $(CC) -g -Wall -c $(CFLAGS) -o $1 $2 -I../include/ $(LIBTRACEEVENT_INCLUDES))
++ $(CC) -g -Wall -c $(CFLAGS) -o $1 $2 -I../include/ $(LIBTRACEEVENT_INCLUDES) $(LDFLAGS))
+
+ ifneq ($(findstring $(MAKEFLAGS), w),w)
+ PRINT_DIR = --no-print-directory