mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00
Code Issues Releases Activity

Update devel/heaptrack some more

Browse Source 
There were patches from Greg V upstream to fix the build of 1.2.0
on FreeBSD, so just chase KDE_INVENT up to that version. This
means we can drop our patches, and it fixes plist issues from my
previous update as well.
This commit is contained in:
Adriaan de Groot 2021-02-13 22:30:53 +00:00
parent 260634b6c7
commit db65b37bc2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=565183
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/heaptrack/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= heaptrack
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.0
DISTVERSION= 1.2.0-43
CATEGORIES= devel kde
MAINTAINER= kde@FreeBSD.org
@ -24,6 +24,6 @@ USE_KDE= auth auth codecs completion config config \
USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
KDE_INVENT= bc9e3744bcc47de978673d1e382f4125a1ab5fa8 sdk
KDE_INVENT= 1c2d406387dc59e7ebba727fd42a647f2f38bba4 sdk
.include <bsd.port.mk>

6
devel/heaptrack/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1613167892
SHA256 (sdk-heaptrack-bc9e3744bcc47de978673d1e382f4125a1ab5fa8_GL0.tar.gz) = 06cc60dc57104b177b0909eb3c63e6cca1a645da095730a2b80e598fdf0253e8
SIZE (sdk-heaptrack-bc9e3744bcc47de978673d1e382f4125a1ab5fa8_GL0.tar.gz) = 1115079
TIMESTAMP = 1613253975
SHA256 (sdk-heaptrack-1c2d406387dc59e7ebba727fd42a647f2f38bba4_GL0.tar.gz) = ddd5e7a62a0f870eb2c2ccd53eec6f3e4a9aa4fcebc3f519d68ddde91da41c69
SIZE (sdk-heaptrack-1c2d406387dc59e7ebba727fd42a647f2f38bba4_GL0.tar.gz) = 1118675

21
devel/heaptrack/files/patch-src_track_heaptrack__inject.cpp
View File

@ -1,21 +0,0 @@
--- src/track/heaptrack_inject.cpp.orig 2020-06-01 22:47:27 UTC
+++ src/track/heaptrack_inject.cpp
@@ -66,8 +66,18 @@ using Dyn = ElfW(Dyn);
using Rel = ElfW(Rel);
using Rela = ElfW(Rela);
using Sym = ElfW(Sym);
+#if __WORDSIZE == 64
using Sxword = ElfW(Sxword);
using Xword = ElfW(Xword);
+#else
+// FreeBSD elf32.h doesn't define Elf32_Sxword or _Xword. This is used in struct
+// elftable, where it's used as a tag value. Our Elf32_Dyn uses Elf32_Sword there,
+// as does the Linux definition (and the standard); the El64_Dyn uses Sxword.
+//
+// Linux elf.h defines Elf32_Sxword as a 64-bit quantity, so let's do that
+using Sxword = int64_t;
+using Xword = uint64_t;
+#endif
}
void overwrite_symbols() noexcept;