Attachment #233033 for bug #263112




# Created by: Mahdi Mokhtari <mokhi64@gmail.com>

PORTNAME=	lttng-ust
PORTVERSION=	2.13.2
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	http://lttng.org/files/${PORTNAME}/


LICENSE=		LGPL21 MIT GPLv2
LICENSE_COMB=		dual
LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
		xmlto:textproc/xmlto
LIB_DEPENDS=	liburcu.so:sysutils/liburcu

USES=		autoreconf gmake libtool localbase pathfix pkgconfig python \
		shebangfix tar:bzip2
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

Lines 1-3 Link Here

(-)b/sysutils/lttng-ust/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483807828	1	TIMESTAMP = 1649309595
2	SHA256 (lttng-ust-2.9.0.tar.bz2) = 4d541a863f42dfc685ca05024027a442c70d03594c154a43e62bc109b1ea5daf	2	SHA256 (lttng-ust-2.13.2.tar.bz2) = 08679a1dfc2c9428885273861628aa5d828972f389a38bb08fdce39adee589b7
3	SIZE (lttng-ust-2.9.0.tar.bz2) = 764027	3	SIZE (lttng-ust-2.13.2.tar.bz2) = 1327075




--- config/libtool.m4.orig	2016-05-12 15:26:58 UTC
+++ config/libtool.m4
@@ -1866,6 +1866,12 @@ else
   lt_cv_dlopen_libs=
 
   case $host_os in
+  FreeBSD*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=""
+    lt_cv_dlopen_self=yes
+    ;;
+
   beos*)
     lt_cv_dlopen="load_add_on"
     lt_cv_dlopen_libs=




--- doc/examples/clock-override/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/clock-override/Makefile	2022-04-07 08:12:24.004645000 +0000
@@ -8,8 +8,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl	# On Linux
-#LIBS = -lc	# On BSD
+#LIBS = -ldl	# On Linux
+LIBS =	# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: lttng-ust-clock-override-example.so




--- doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake.orig	2022-01-27 20:18:46.000000000 +0000
+++ doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake	2022-04-07 08:16:37.652120000 +0000
@@ -97,13 +97,13 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_INCLUDE_DIRS_GEN
     add_library(LTTng::UST UNKNOWN IMPORTED)
     set_target_properties(LTTng::UST PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES "${LTTNGUST_INCLUDE_DIRS};${LTTNGUST_INCLUDE_DIRS_GENERATED}"
-      INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}
+      INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}"
       IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       IMPORTED_LOCATION "${LTTNGUST_LIBRARIES}")
   endif()
 
   # add libdl to required libraries
-  set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} ${CMAKE_DL_LIBS})
+  set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} "${CMAKE_DL_LIBS}")
 endif()
 
 # handle the QUIETLY and REQUIRED arguments and set LTTNGUST_FOUND to




--- doc/examples/demo-tracef/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/demo-tracef/Makefile	2022-04-07 08:12:24.008080000 +0000
@@ -8,8 +8,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl -llttng-ust	# On Linux
-#LIBS = -lc	# On BSD
+#LIBS = -ldl -llttng-ust	# On Linux
+LIBS = -llttng-ust	# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: demo-tracef




--- doc/examples/demo-tracelog/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/demo-tracelog/Makefile	2022-04-07 08:12:24.010424000 +0000
@@ -8,8 +8,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl -llttng-ust	# On Linux
-#LIBS = -lc	# On BSD
+#LIBS = -ldl -llttng-ust	# On Linux
+LIBS = -llttng-ust	# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: demo-tracelog




--- doc/examples/demo/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/demo/Makefile	2022-04-07 08:12:24.012635000 +0000
@@ -7,8 +7,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl	# On Linux
-#LIBS = -lc	# On BSD
+#LIBS = -ldl	# On Linux
+LIBS =	# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: demo lttng-ust-provider-ust-tests-demo.so lttng-ust-provider-ust-tests-demo3.so




--- doc/examples/easy-ust/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/easy-ust/Makefile	2022-04-07 08:12:24.014820000 +0000
@@ -9,8 +9,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl -llttng-ust		# On Linux
-#LIBS = -lc -llttng-ust		# On BSD
+#LIBS = -ldl -llttng-ust		# On Linux
+LIBS = -llttng-ust		# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: sample




--- doc/examples/gen-tp/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/gen-tp/Makefile	2022-04-07 08:12:24.016989000 +0000
@@ -12,8 +12,8 @@
 
 PYTHON := python
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl -llttng-ust		#On Linux
-#LIBS = -lc -llttng-ust		#On BSD
+#LIBS = -ldl -llttng-ust		#On Linux
+LIBS = -llttng-ust		#On FreeBSD
 AM_V_P := :
 
 all: sample
 




--- doc/examples/getcpu-override/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/getcpu-override/Makefile	2022-04-07 08:12:24.019140000 +0000
@@ -8,8 +8,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
-LIBS = -ldl	# On Linux
-#LIBS = -lc	# On BSD
+#LIBS = -ldl	# On Linux
+LIBS =	# On FreeBSD
 LOCAL_CPPFLAGS += -I.
 AM_V_P := :
 
 all: lttng-ust-getcpu-override-example.so




--- doc/examples/hello-static-lib/Makefile.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/examples/hello-static-lib/Makefile	2022-04-07 08:12:24.021667000 +0000
@@ -8,8 +8,8 @@
 #
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
-ifdef AM_CC
-	CC = $(AM_CC)
-endif
-
 LOCAL_CPPFLAGS += -I.
-LIBS = -ldl -llttng-ust	# On Linux
-#LIBS = -lc -llttng-ust	# On BSD
+#LIBS = -ldl -llttng-ust	# On Linux
+LIBS = -llttng-ust	# On FreeBSD
 AM_V_P := :
 AR ?= ar
 

Lines 1-38 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_man_lttng-ust.3 (-21 / +36 lines)
1	--- doc/man/lttng-ust.3.orig 2016-11-29 22:13:51 UTC	1	--- doc/man/lttng-ust.3.orig 2022-03-25 17:53:42.000000000 +0000
2	+++ doc/man/lttng-ust.3	2	+++ doc/man/lttng-ust.3 2022-04-07 08:13:09.748686000 +0000
3	@@ -88,7 +88,7 @@ lttng-ust \- LTTng user space tracing	3	@@ -2,12 +2,12 @@
4	#define \fBtracepoint_enabled\fR(\fIprov_name\fR, \fIt_name\fR)	4	.\" Title: lttng-ust
5	.fi	5	.\" Author: [see the "AUTHORS" section]
6	.sp	6	.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
7	-Link with \fB-llttng-ust -ldl\fR, following this man page\&.	7	-.\" Date: 03/25/2022
8	+Link with \fB-llttng-ust\fR, following this man page\&.	8	+.\" Date: 04/07/2022
9	.SH "DESCRIPTION"	9	.\" Manual: LTTng Manual
		10	.\" Source: LTTng 2.13.2
		11	.\" Language: English
		12	.\"
		13	-.TH "LTTNG\-UST" "3" "03/25/2022" "LTTng 2\&.13\&.2" "LTTng Manual"
		14	+.TH "LTTNG\-UST" "3" "04/07/2022" "LTTng 2\&.13\&.2" "LTTng Manual"
		15	.\" -----------------------------------------------------------------
		16	.\" * Define some portability stuff
		17	.\" -----------------------------------------------------------------
		18	@@ -114,7 +114,7 @@ Link with, following this manual page:
		19	.sp -1
		20	.IP \(bu 2.3
		21	.\}
		22	-\fB-llttng-ust -ldl\fR
		23	+\fB-llttng-ust\fR
		24	.RE
10	.sp	25	.sp
11	The \fILinux Trace Toolkit: next generation\fR <http://lttng.org/> is an open source software package used for correlated tracing of the Linux kernel, user applications, and user libraries\&.	26	.RS 4
12	@@ -919,7 +919,7 @@ Then, link your application with this ob	27	@@ -1066,7 +1066,7 @@ Then, link your application with this object file (or
13	.RS 4	28	.RS 4
14	.\}	29	.\}
15	.nf	30	.nf
16	-cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl	31	-$ cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
17	+cc \-o app tp\&.o app\&.o \-llttng\-ust	32	+$ cc \-o app tp\&.o app\&.o \-llttng\-ust
18	.fi	33	.fi
19	.if n \{\	34	.if n \{\
20	.RE	35	.RE
21	@@ -1004,7 +1004,7 @@ This tracepoint provider shared object i	36	@@ -1151,7 +1151,7 @@ This tracepoint provider shared object isn\(cqt linked
22	.RS 4	37	.RS 4
23	.\}	38	.\}
24	.nf	39	.nf
25	-cc \-o app app\&.o tp\-define\&.o \-ldl	40	-$ cc \-o app app\&.o tp\-define\&.o \-ldl
26	+cc \-o app app\&.o tp\-define\&.o	41	+$ cc \-o app app\&.o tp\-define\&.o
27	.fi	42	.fi
28	.if n \{\	43	.if n \{\
29	.RE	44	.RE
30	@@ -1544,7 +1544,7 @@ You can compile the source files and lin	45	@@ -1823,7 +1823,7 @@ You can compile the source files and link them togethe
31	.nf	46	.nf
32	cc \-c \-I\&. tp\&.c	47	$ cc \-c \-I\&. tp\&.c
33	cc \-c app\&.c	48	$ cc \-c app\&.c
34	-cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl	49	-$ cc \-o app tp\&.o app\&.o \-llttng\-ust \-ldl
35	+cc \-o app tp\&.o app\&.o \-llttng\-ust	50	+$ cc \-o app tp\&.o app\&.o \-llttng\-ust
36	.fi	51	.fi
37	.if n \{\	52	.if n \{\
38	.RE	53	.RE




--- doc/man/lttng-ust.3.txt.orig	2022-03-25 15:37:17.000000000 +0000
+++ doc/man/lttng-ust.3.txt	2022-04-07 08:12:24.027503000 +0000
@@ -83,7 +83,7 @@ SYNOPSIS
 #define *tracepoint*('prov_name', 't_name', ...)
 #define *tracepoint_enabled*('prov_name', 't_name')
 
 Link with, following this manual page:
+Link with `-llttng-ust`, following this man page.
 
-* `-llttng-ust -ldl`
+* `-llttng-ust`
 * If you define `_LGPL_SOURCE` before including
   `<lttng/tracepoint.h>` (directly or indirectly): `-llttng-ust-common`
 
@@ -737,7 +737,7 @@ BSD system):
@@ -636,7 +636,7 @@ library containing it) and with `liblttn
 
 [role="term"]
 ----
-$ cc -o app tp.o app.o -llttng-ust -ldl
+$ cc -o app tp.o app.o -llttng-ust
 ----
 
 
@@ -797,7 +797,7 @@ libdl:
 
 [role="term"]
 ----
-$ cc -o app app.o tp-define.o -ldl
+$ cc -o app app.o tp-define.o
 ----
 
 There are two ways to dynamically load the tracepoint provider shared
@@ -1221,7 +1221,7 @@ like this:
 ----
 $ cc -c -I. tp.c
 $ cc -c app.c
-$ cc -o app tp.o app.o -llttng-ust -ldl
+$ cc -o app tp.o app.o -llttng-ust
 ----
 
 Using the man:lttng(1) tool, create an LTTng tracing session, enable

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-include_lttng_ust-dlfcn.h (-11 lines)
1	--- include/lttng/ust-dlfcn.h.orig 2016-11-29 01:46:24 UTC
2	+++ include/lttng/ust-dlfcn.h
3	@@ -27,6 +27,8 @@
4	* SOFTWARE.
5	*/
6
7	+typedef long Lmid_t;
8	+
9	#ifdef _DLFCN_H
10	#error "Please include lttng/ust-dlfcn.h before dlfcn.h."
11	#endif /* _DLFCN_H */




--- include/lttng/ust-elf.h.orig	2016-10-18 22:44:06 UTC
+++ include/lttng/ust-elf.h
@@ -21,7 +21,19 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#define __bswap_16 bswap16
+#define __bswap_32 bswap32
+#define __bswap_64 bswap64
+#define NT_GNU_BUILD_ID 3
+#else
 #include <byteswap.h>
+#endif
 #include <elf.h>
 #include <lttng/ust-endian.h>
 




--- include/lttng/ust-tracepoint-event.h.orig	2022-03-25 15:37:17.000000000 +0000
+++ include/lttng/ust-tracepoint-event.h	2022-04-07 08:12:24.030383000 +0000
@@ -14,6 +14,11 @@
 #include <lttng/ust-arch.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/tracepoint.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#define __bswap_16 bswap16
+#define __bswap_32 bswap32
+#define __bswap_64 bswap64
+#define NT_GNU_BUILD_ID 3
+#else
 #include <byteswap.h>
+#endif
 #include <lttng/ust-endian.h>
 #include <lttng/ust-api-compat.h>
 #include <string.h>
@@ -1033,6 +1038,7 @@ void lttng_ust__event_probe__##_provider##___##_name(L
 
 /* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
@@ -941,6 +950,7 @@ static const struct lttng_event_desc __e
 
 /* Reset all macros within TRACEPOINT_EVENT */
 #include <lttng/ust-tracepoint-event-reset.h>
+#include <lttng/ust-events.h>
 
 /*
  * Declare _loglevel___##__provider##___##__name as non-static, with

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_Makefile.am (-9 lines)
1	--- liblttng-ust-ctl/Makefile.am.orig 2017-01-31 12:55:37 UTC
2	+++ liblttng-ust-ctl/Makefile.am
3	@@ -10,5 +10,4 @@ liblttng_ust_ctl_la_LDFLAGS = \
4	liblttng_ust_ctl_la_LIBADD = \
5	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
6	$(top_builddir)/liblttng-ust/liblttng-ust-support.la \
7	- $(top_builddir)/snprintf/libustsnprintf.la \
8	- -ldl
9	+ $(top_builddir)/snprintf/libustsnprintf.la

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_Makefile.in (-11 lines)
1	--- liblttng-ust-ctl/Makefile.in.orig 2016-11-29 22:25:14 UTC
2	+++ liblttng-ust-ctl/Makefile.in
3	@@ -375,8 +375,7 @@ liblttng_ust_ctl_la_LIBADD = \
4	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
5	$(top_builddir)/liblttng-ust/liblttng-ust-support.la \
6	- $(top_builddir)/snprintf/libustsnprintf.la \
7	- -ldl
8	+ $(top_builddir)/snprintf/libustsnprintf.la
9
10	all: all-am
11




--- liblttng-ust-ctl/ustctl.c.orig	2016-11-29 01:46:24 UTC
+++ liblttng-ust-ctl/ustctl.c
@@ -23,7 +23,19 @@
 #include <lttng/ust-abi.h>
 #include <lttng/ust-events.h>
 #include <sys/mman.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/endian.h>
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#define __bswap_16 bswap16
+#define __bswap_32 bswap32
+#define __bswap_64 bswap64
+#define NT_GNU_BUILD_ID 3
+#else
 #include <byteswap.h>
+#endif
 
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
@@ -76,7 +88,7 @@ extern void lttng_ring_buffer_client_discard_exit(void
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
-volatile enum ust_loglevel ust_loglevel;
+extern volatile enum ust_loglevel ust_loglevel;
 
 int ustctl_release_handle(int sock, int handle)
 {

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust-dl_ust__dl.h (-10 lines)
1	--- liblttng-ust-dl/ust_dl.h.orig 2016-11-29 01:46:24 UTC
2	+++ liblttng-ust-dl/ust_dl.h
3	@@ -36,6 +36,7 @@ extern "C" {
4
5	#define LTTNG_UST_DL_PROVIDER
6	#include <lttng/tracepoint.h>
7	+#include <lttng/ust-dlfcn.h>
8
9	TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
10	TP_ARGS(void , ip, void , baddr, const char *, path,

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust-fd_lttng-ust-fd.c (-11 lines)
1	--- liblttng-ust-fd/lttng-ust-fd.c.orig 2016-11-29 01:46:24 UTC
2	+++ liblttng-ust-fd/lttng-ust-fd.c
3	@@ -28,7 +28,7 @@
4	#include <helper.h>
5	#include "usterr-signal-safe.h"
6
7	-volatile enum ust_loglevel ust_loglevel;
8	+extern volatile enum ust_loglevel ust_loglevel;
9
10	static int (*__lttng_ust_fd_plibc_close)(int fd);
11

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust_Makefile.am (-10 lines)
1	--- liblttng-ust/Makefile.am.orig 2016-11-29 01:46:24 UTC
2	+++ liblttng-ust/Makefile.am
3	@@ -89,8 +89,7 @@ liblttng_ust_la_LIBADD = \
4	-lpthread \
5	-lrt \
6	-lurcu-cds \
7	- -ldl \
8	$(top_builddir)/snprintf/libustsnprintf.la \
9	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
10	liblttng-ust-tracepoint.la \

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust_Makefile.in (-10 lines)
1	--- liblttng-ust/Makefile.in.orig 2016-11-29 22:25:14 UTC
2	+++ liblttng-ust/Makefile.in
3	@@ -482,8 +482,7 @@ liblttng_ust_la_LIBADD = \
4	-lpthread \
5	-lrt \
6	-lurcu-cds \
7	- -ldl \
8	$(top_builddir)/snprintf/libustsnprintf.la \
9	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
10	liblttng-ust-tracepoint.la \




--- liblttng-ust/compat.h.orig	2016-11-29 01:46:24 UTC
+++ liblttng-ust/compat.h
@@ -73,9 +73,15 @@ void lttng_ust_getprocname(char *name)
 }
 
 /*
- * If pthread_set_name_np is available.
+ * If pthread_setname_np or pthread_set_name_np is available.
  */
-#ifdef HAVE_PTHREAD_SET_NAME_NP
+#ifdef HAVE_PTHREAD_SETNAME_NP
+static inline
+int lttng_pthread_setname_np(pthread_t thread, const char *name)
+{
+	return pthread_setname_np(thread, name);
+}
+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
 static inline
 int lttng_pthread_setname_np(pthread_t thread, const char *name)
 {

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-lttng-ust.pc.in (-10 lines)
1	--- lttng-ust.pc.in.orig 2015-06-01 11:38:44 UTC
2	+++ lttng-ust.pc.in
3	@@ -8,6 +8,6 @@ Description: The LTTng Userspace Tracer
4	Version: @PACKAGE_VERSION@
5	Requires:
6	Requires.private: liburcu-bp
7	-Libs: -L${libdir} -llttng-ust -ldl
8	+Libs: -L${libdir} -llttng-ust
9	Cflags: -I${includedir}
10




--- m4/libtool.m4.orig	2022-03-25 17:46:41.000000000 +0000
+++ m4/libtool.m4	2022-04-07 08:12:29.678317000 +0000
@@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -2886,18 +2887,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3557,7 +3546,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4063,8 +4052,7 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
-    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4436,7 +4424,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4948,9 +4936,6 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -5013,9 +4998,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5270,7 +5252,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5791,7 +5773,6 @@ _LT_EOF
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5813,7 +5794,7 @@ _LT_EOF
       esac
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6439,7 +6420,7 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -6814,7 +6795,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6879,7 +6860,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -7218,7 +7199,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -7302,7 +7283,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -7313,7 +7294,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-src_common_compat_dlfcn.h (+11 lines)
1	--- src/common/compat/dlfcn.h.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ src/common/compat/dlfcn.h 2022-04-07 08:12:24.038410000 +0000
3	@@ -9,6 +9,8 @@
4	#ifndef _UST_COMMON_COMPAT_DLFCN_H
5	#define _UST_COMMON_COMPAT_DLFCN_H
6
7	+typedef long Lmid_t;
8	+
9	#ifdef _DLFCN_H
10	#error "Please include compat/dlfcn.h before dlfcn.h."
11	#endif /* _DLFCN_H */




--- src/common/elf.h.orig	2022-03-25 15:37:17.000000000 +0000
+++ src/common/elf.h	2022-04-07 08:12:24.040730000 +0000
@@ -10,6 +10,11 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/endian.h>
+#define NT_GNU_BUILD_ID 3
+#endif
 #include <elf.h>
 
 #include <lttng/ust-endian.h>




--- src/lib/lttng-ust-ctl/ustctl.c.orig	2022-03-25 15:37:22.000000000 +0000
+++ src/lib/lttng-ust-ctl/ustctl.c	2022-04-07 08:12:24.043859000 +0000
@@ -8,6 +8,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/endian.h>
+#define NT_GNU_BUILD_ID 3
+#endif
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-src_lib_lttng-ust-dl_ust_dl.h (+10 lines)
1	--- src/lib/lttng-ust-dl/ust_dl.h.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ src/lib/lttng-ust-dl/ust_dl.h 2022-04-07 08:12:24.046219000 +0000
3	@@ -21,6 +21,7 @@ extern "C" {
4
5	#define LTTNG_UST_DL_PROVIDER
6	#include <lttng/tracepoint.h>
7	+#include <common/compat/dlfcn.h>
8
9	LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
10	LTTNG_UST_TP_ARGS(void , ip, void , baddr, const char *, path,

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-src_lib_lttng-ust.pc.in (+10 lines)
1	--- src/lib/lttng-ust.pc.in.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ src/lib/lttng-ust.pc.in 2022-04-07 08:12:24.048438000 +0000
3	@@ -7,6 +7,6 @@ Name: LTTng Userspace Tracer
4	Description: The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code.
5	Version: @PACKAGE_VERSION@
6	Requires:
7	-Libs: -L${libdir} -llttng-ust -llttng-ust-common -ldl
8	+Libs: -L${libdir} -llttng-ust -llttng-ust-common
9	Cflags: -I${includedir}
10




bin/lttng-gen-tp
include/lttng/tp/lttng-ust-tracef.h
include/lttng/tp/lttng-ust-tracelog.h
include/lttng/lttng-ust-tracef.h
include/lttng/lttng-ust-tracelog.h
include/lttng/ringbuffer-abi.h
include/lttng/ringbuffer-config.h
include/lttng/tracef.h
include/lttng/tracelog.h
include/lttng/tracepoint-event.h
include/lttng/tracepoint-rcu.h
include/lttng/tracepoint-types.h
include/lttng/tracepoint.h
include/lttng/urcu/pointer.h
include/lttng/urcu/static/pointer.h
include/lttng/urcu/static/urcu-ust.h
include/lttng/urcu/urcu-ust.h
include/lttng/ust-abi.h
include/lttng/ust-api-compat.h
include/lttng/ust-arch.h
include/lttng/ust-cancelstate.h
include/lttng/ust-clock.h
include/lttng/ust-common.h
include/lttng/ust-compiler.h
include/lttng/ust-config.h
include/lttng/ust-ctl.h
include/lttng/ust-elf.h
include/lttng/ust-endian.h
include/lttng/ust-error.h
include/lttng/ust-events.h
include/lttng/ust-fork.h
include/lttng/ust-getcpu.h
include/lttng/ust-libc-wrapper.h
include/lttng/ust-ringbuffer-context.h
include/lttng/ust-sigbus.h
include/lttng/ust-thread.h
include/lttng/ust-tracepoint-event-nowrite.h
include/lttng/ust-tracepoint-event-reset.h
include/lttng/ust-tracepoint-event-write.h
include/lttng/ust-tracepoint-event.h
include/lttng/ust-tracer.h
include/lttng/ust-utils.h
include/lttng/ust-version.h
lib/liblttng-ust-common.so
lib/liblttng-ust-common.so.1
lib/liblttng-ust-common.so.1.0.0
lib/liblttng-ust-ctl.so
lib/liblttng-ust-ctl.so.5
lib/liblttng-ust-ctl.so.5.0.0
lib/liblttng-ust-cyg-profile-fast.a
lib/liblttng-ust-cyg-profile-fast.so
lib/liblttng-ust-cyg-profile-fast.so.1
lib/liblttng-ust-cyg-profile-fast.so.1.0.0
lib/liblttng-ust-cyg-profile.a
lib/liblttng-ust-cyg-profile.so
lib/liblttng-ust-cyg-profile.so.1
lib/liblttng-ust-cyg-profile.so.1.0.0
lib/liblttng-ust-dl.a
lib/liblttng-ust-dl.so
lib/liblttng-ust-dl.so.1
lib/liblttng-ust-dl.so.1.0.0
lib/liblttng-ust-fd.a
lib/liblttng-ust-fd.so
lib/liblttng-ust-fd.so.1
lib/liblttng-ust-fd.so.1.0.0
lib/liblttng-ust-fork.a
lib/liblttng-ust-fork.so
lib/liblttng-ust-fork.so.1
lib/liblttng-ust-fork.so.1.0.0
lib/liblttng-ust-libc-wrapper.a
lib/liblttng-ust-libc-wrapper.so
lib/liblttng-ust-libc-wrapper.so.1
lib/liblttng-ust-libc-wrapper.so.1.0.0
lib/liblttng-ust-pthread-wrapper.a
lib/liblttng-ust-pthread-wrapper.so
lib/liblttng-ust-pthread-wrapper.so.1
lib/liblttng-ust-pthread-wrapper.so.1.0.0
lib/liblttng-ust-tracepoint.a
lib/liblttng-ust-tracepoint.so
lib/liblttng-ust-tracepoint.so.1
lib/liblttng-ust-tracepoint.so.1.0.0
lib/liblttng-ust.a
lib/liblttng-ust.so
lib/liblttng-ust.so.1
lib/liblttng-ust.so.1.0.0
libdata/pkgconfig/lttng-ust-ctl.pc
libdata/pkgconfig/lttng-ust.pc
man/man1/lttng-gen-tp.1.gz
man/man3/do_tracepoint.3.gz
man/man3/lttng-ust-cyg-profile.3.gz
man/man3/lttng-ust-dl.3.gz
man/man3/lttng-ust.3.gz
man/man3/lttng_ust_do_tracepoint.3.gz
man/man3/lttng_ust_tracef.3.gz
man/man3/lttng_ust_tracelog.3.gz
man/man3/lttng_ust_tracepoint.3.gz
man/man3/lttng_ust_tracepoint_enabled.3.gz
man/man3/lttng_ust_vtracef.3.gz
man/man3/lttng_ust_vtracelog.3.gz
man/man3/tracef.3.gz
man/man3/tracelog.3.gz
man/man3/tracepoint.3.gz
man/man3/tracepoint_enabled.3.gz
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/examples/README
%%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/Makefile

%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/Makefile
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/README
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-tracef.c
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-vtracef.c
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/Makefile
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/README
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-tracelog.c
%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-vtracelog.c
%%PORTDOCS%%%%DOCSDIR%%/examples/demo/Makefile
%%PORTDOCS%%%%DOCSDIR%%/examples/demo/README
%%PORTDOCS%%%%DOCSDIR%%/examples/demo/demo-trace

Return to bug 263112

Lines 1-7 Link Here

(-)b/sysutils/lttng-ust/Makefile (-5 / +5 lines)
1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>	1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
2		2
3	PORTNAME= lttng-ust	3	PORTNAME= lttng-ust
4	PORTVERSION= 2.9.0	4	PORTVERSION= 2.13.2
5	PORTREVISION= 2	5	PORTREVISION= 2
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= http://lttng.org/files/${PORTNAME}/	7	MASTER_SITES= http://lttng.org/files/${PORTNAME}/
Lines 11-25 COMMENT= Libraries to instrument and trace user applications Link Here
11		11
12	LICENSE= LGPL21 MIT GPLv2	12	LICENSE= LGPL21 MIT GPLv2
13	LICENSE_COMB= dual	13	LICENSE_COMB= dual
14	LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING	14	LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE
15	LICENSE_FILE_MIT= ${WRKSRC}/COPYING	15	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
16	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING	16	LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE
17		17
18	BUILD_DEPENDS= asciidoc:textproc/asciidoc \	18	BUILD_DEPENDS= asciidoc:textproc/asciidoc \
19	xmlto:textproc/xmlto	19	xmlto:textproc/xmlto
20	LIB_DEPENDS= liburcu.so:sysutils/liburcu	20	LIB_DEPENDS= liburcu.so:sysutils/liburcu
21		21
22	USES= autoreconf gmake libtool localbase pathfix python \	22	USES= autoreconf gmake libtool localbase pathfix pkgconfig python \
23	shebangfix tar:bzip2	23	shebangfix tar:bzip2
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-config_libtool.m4 (-15 lines)
1	--- config/libtool.m4.orig 2016-05-12 15:26:58 UTC
2	+++ config/libtool.m4
3	@@ -1866,6 +1866,12 @@ else
4	lt_cv_dlopen_libs=
5
6	case $host_os in
7	+ FreeBSD*)
8	+ lt_cv_dlopen="dlopen"
9	+ lt_cv_dlopen_libs=""
10	+ lt_cv_dlopen_self=yes
11	+ ;;
12	+
13	beos*)
14	lt_cv_dlopen="load_add_on"
15	lt_cv_dlopen_libs=

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_clock-override_Makefile (-8 / +4 lines)
1	--- doc/examples/clock-override/Makefile.orig 2016-08-25 21:53:05 UTC	1	--- doc/examples/clock-override/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/clock-override/Makefile	2	+++ doc/examples/clock-override/Makefile 2022-04-07 08:12:24.004645000 +0000
3	@@ -15,12 +15,8 @@	3	@@ -8,8 +8,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl # On Linux	7	-LIBS = -ldl # On Linux
12	-#LIBS = -lc # On BSD	8	-#LIBS = -lc # On BSD
13	+#LIBS = -ldl # On Linux	9	+#LIBS = -ldl # On Linux
14	+LIBS = # On FreeBSD	10	+LIBS = # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: lttng-ust-clock-override-example.so

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_cmake-multiple-shared-libraries_cmake_FindLTTngUST.cmake (+18 lines)
1	--- doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake.orig 2022-01-27 20:18:46.000000000 +0000
2	+++ doc/examples/cmake-multiple-shared-libraries/cmake/FindLTTngUST.cmake 2022-04-07 08:16:37.652120000 +0000
3	@@ -97,13 +97,13 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_INCLUDE_DIRS_GEN
4	add_library(LTTng::UST UNKNOWN IMPORTED)
5	set_target_properties(LTTng::UST PROPERTIES
6	INTERFACE_INCLUDE_DIRECTORIES "${LTTNGUST_INCLUDE_DIRS};${LTTNGUST_INCLUDE_DIRS_GENERATED}"
7	- INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}
8	+ INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS}"
9	IMPORTED_LINK_INTERFACE_LANGUAGES "C"
10	IMPORTED_LOCATION "${LTTNGUST_LIBRARIES}")
11	endif()
12
13	# add libdl to required libraries
14	- set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} ${CMAKE_DL_LIBS})
15	+ set(LTTNGUST_LIBRARIES ${LTTNGUST_LIBRARIES} "${CMAKE_DL_LIBS}")
16	endif()
17
18	# handle the QUIETLY and REQUIRED arguments and set LTTNGUST_FOUND to

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_demo-tracef_Makefile (-8 / +4 lines)
1	--- doc/examples/demo-tracef/Makefile.orig 2016-08-08 21:25:36 UTC	1	--- doc/examples/demo-tracef/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/demo-tracef/Makefile	2	+++ doc/examples/demo-tracef/Makefile 2022-04-07 08:12:24.008080000 +0000
3	@@ -15,12 +15,8 @@	3	@@ -8,8 +8,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl -llttng-ust # On Linux	7	-LIBS = -ldl -llttng-ust # On Linux
12	-#LIBS = -lc # On BSD	8	-#LIBS = -lc # On BSD
13	+#LIBS = -ldl -llttng-ust # On Linux	9	+#LIBS = -ldl -llttng-ust # On Linux
14	+LIBS = -llttng-ust # On FreeBSD	10	+LIBS = -llttng-ust # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: demo-tracef

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_demo-tracelog_Makefile (-8 / +4 lines)
1	--- doc/examples/demo-tracelog/Makefile.orig 2016-08-25 21:53:05 UTC	1	--- doc/examples/demo-tracelog/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/demo-tracelog/Makefile	2	+++ doc/examples/demo-tracelog/Makefile 2022-04-07 08:12:24.010424000 +0000
3	@@ -15,12 +15,8 @@	3	@@ -8,8 +8,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl -llttng-ust # On Linux	7	-LIBS = -ldl -llttng-ust # On Linux
12	-#LIBS = -lc # On BSD	8	-#LIBS = -lc # On BSD
13	+#LIBS = -ldl -llttng-ust # On Linux	9	+#LIBS = -ldl -llttng-ust # On Linux
14	+LIBS = -llttng-ust # On FreeBSD	10	+LIBS = -llttng-ust # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: demo-tracelog

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_demo_Makefile (-8 / +4 lines)
1	--- doc/examples/demo/Makefile.orig 2016-08-08 21:25:36 UTC	1	--- doc/examples/demo/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/demo/Makefile	2	+++ doc/examples/demo/Makefile 2022-04-07 08:12:24.012635000 +0000
3	@@ -14,12 +14,8 @@	3	@@ -7,8 +7,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl # On Linux	7	-LIBS = -ldl # On Linux
12	-#LIBS = -lc # On BSD	8	-#LIBS = -lc # On BSD
13	+#LIBS = -ldl # On Linux	9	+#LIBS = -ldl # On Linux
14	+LIBS = # On FreeBSD	10	+LIBS = # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: demo lttng-ust-provider-ust-tests-demo.so lttng-ust-provider-ust-tests-demo3.so

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_easy-ust_Makefile (-8 / +4 lines)
1	--- doc/examples/easy-ust/Makefile.orig 2016-08-08 21:25:36 UTC	1	--- doc/examples/easy-ust/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/easy-ust/Makefile	2	+++ doc/examples/easy-ust/Makefile 2022-04-07 08:12:24.014820000 +0000
3	@@ -16,12 +16,8 @@	3	@@ -9,8 +9,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl -llttng-ust # On Linux	7	-LIBS = -ldl -llttng-ust # On Linux
12	-#LIBS = -lc -llttng-ust # On BSD	8	-#LIBS = -lc -llttng-ust # On BSD
13	+#LIBS = -ldl -llttng-ust # On Linux	9	+#LIBS = -ldl -llttng-ust # On Linux
14	+LIBS = -llttng-ust # On FreeBSD	10	+LIBS = -llttng-ust # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: sample

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_gen-tp_Makefile (-10 / +6 lines)
1	--- doc/examples/gen-tp/Makefile.orig 2016-08-08 21:25:36 UTC	1	--- doc/examples/gen-tp/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/gen-tp/Makefile	2	+++ doc/examples/gen-tp/Makefile 2022-04-07 08:12:24.016989000 +0000
3	@@ -17,12 +17,8 @@	3	@@ -12,8 +12,8 @@
4	#	4
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	PYTHON := python
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl -llttng-ust #On Linux	7	-LIBS = -ldl -llttng-ust #On Linux
12	-#LIBS = -lc -llttng-ust #On BSD	8	-#LIBS = -lc -llttng-ust #On BSD
13	+#LIBS = -ldl -llttng-ust #On Linux	9	+#LIBS = -ldl -llttng-ust #On Linux
14	+LIBS = -llttng-ust #On FreeBSD	10	+LIBS = -llttng-ust #On FreeBSD
		11	AM_V_P := :
15		12
16	all: sample	13	all: sample
17

Lines 1-17 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_getcpu-override_Makefile (-8 / +4 lines)
1	--- doc/examples/getcpu-override/Makefile.orig 2016-08-25 21:53:05 UTC	1	--- doc/examples/getcpu-override/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/getcpu-override/Makefile	2	+++ doc/examples/getcpu-override/Makefile 2022-04-07 08:12:24.019140000 +0000
3	@@ -15,12 +15,8 @@	3	@@ -8,8 +8,8 @@
4	#	4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	5	# This makefile is purposefully kept simple to support GNU and BSD make.
6		6
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	-LIBS = -ldl # On Linux	7	-LIBS = -ldl # On Linux
12	-#LIBS = -lc # On BSD	8	-#LIBS = -lc # On BSD
13	+#LIBS = -ldl # On Linux	9	+#LIBS = -ldl # On Linux
14	+LIBS = # On FreeBSD	10	+LIBS = # On FreeBSD
15	LOCAL_CPPFLAGS += -I.	11	LOCAL_CPPFLAGS += -I.
		12	AM_V_P := :
16		13
17	all: lttng-ust-getcpu-override-example.so

Lines 1-18 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_examples_hello-static-lib_Makefile (-10 / +5 lines)
1	--- doc/examples/hello-static-lib/Makefile.orig 2016-08-08 21:25:36 UTC	1	--- doc/examples/hello-static-lib/Makefile.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/examples/hello-static-lib/Makefile	2	+++ doc/examples/hello-static-lib/Makefile 2022-04-07 08:12:24.021667000 +0000
3	@@ -14,13 +14,9 @@	3	@@ -8,8 +8,8 @@
4	#
5	# This makefile is purposefully kept simple to support GNU and BSD make.	4	# This makefile is purposefully kept simple to support GNU and BSD make.
6		5
7	-ifdef AM_CC
8	- CC = $(AM_CC)
9	-endif
10	-
11	LOCAL_CPPFLAGS += -I.	6	LOCAL_CPPFLAGS += -I.
12	-LIBS = -ldl -llttng-ust # On Linux	7	-LIBS = -ldl -llttng-ust # On Linux
13	-#LIBS = -lc -llttng-ust # On BSD	8	-#LIBS = -lc -llttng-ust # On BSD
14	+#LIBS = -ldl -llttng-ust # On Linux	9	+#LIBS = -ldl -llttng-ust # On Linux
15	+LIBS = -llttng-ust # On FreeBSD	10	+LIBS = -llttng-ust # On FreeBSD
16		11	AM_V_P := :
17	all: hello	12	AR ?= ar
18		13

Lines 1-38 Link Here

(-)b/sysutils/lttng-ust/files/patch-doc_man_lttng-ust.3.txt (-25 / +25 lines)
1	--- doc/man/lttng-ust.3.txt.orig 2016-11-29 21:06:58 UTC	1	--- doc/man/lttng-ust.3.txt.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ doc/man/lttng-ust.3.txt	2	+++ doc/man/lttng-ust.3.txt 2022-04-07 08:12:24.027503000 +0000
3	@@ -65,7 +65,7 @@ SYNOPSIS	3	@@ -83,7 +83,7 @@ SYNOPSIS
4	#define tracepoint('prov_name', 't_name', ...)
5	#define tracepoint_enabled('prov_name', 't_name')
6		4
7	-Link with `-llttng-ust -ldl`, following this man page.	5	Link with, following this manual page:
8	+Link with `-llttng-ust`, following this man page.
9		6
		7	-* `-llttng-ust -ldl`
		8	+* `-llttng-ust`
		9	* If you define `_LGPL_SOURCE` before including
		10	`<lttng/tracepoint.h>` (directly or indirectly): `-llttng-ust-common`
10		11
11	DESCRIPTION	12	@@ -737,7 +737,7 @@ BSD system):
12	@@ -636,7 +636,7 @@ library containing it) and with `liblttn
13		13
14	[role="term"]	14	[role="term"]
15	-------------------------------------	15	----
16	-cc -o app tp.o app.o -llttng-ust -ldl	16	-$ cc -o app tp.o app.o -llttng-ust -ldl
17	+cc -o app tp.o app.o -llttng-ust	17	+$ cc -o app tp.o app.o -llttng-ust
18	-------------------------------------	18	----
19		19
20		20
21	@@ -696,7 +696,7 @@ libdl:	21	@@ -797,7 +797,7 @@ libdl:
22		22
23	[role="term"]	23	[role="term"]
24	--------------------------------	24	----
25	-cc -o app app.o tp-define.o -ldl	25	-$ cc -o app app.o tp-define.o -ldl
26	+cc -o app app.o tp-define.o	26	+$ cc -o app app.o tp-define.o
27	--------------------------------	27	----
28		28
29	There are two ways to dynamically load the tracepoint provider shared	29	There are two ways to dynamically load the tracepoint provider shared
30	@@ -1036,7 +1036,7 @@ like this:	30	@@ -1221,7 +1221,7 @@ like this:
31	-------------------------------------	31	----
32	cc -c -I. tp.c	32	$ cc -c -I. tp.c
33	cc -c app.c	33	$ cc -c app.c
34	-cc -o app tp.o app.o -llttng-ust -ldl	34	-$ cc -o app tp.o app.o -llttng-ust -ldl
35	+cc -o app tp.o app.o -llttng-ust	35	+$ cc -o app tp.o app.o -llttng-ust
36	-------------------------------------	36	----
37		37
38	Using the man:lttng(1) tool, create an LTTng tracing session, enable	38	Using the man:lttng(1) tool, create an LTTng tracing session, enable

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-include_lttng_ust-elf.h (-22 lines)
1	--- include/lttng/ust-elf.h.orig 2016-10-18 22:44:06 UTC
2	+++ include/lttng/ust-elf.h
3	@@ -21,7 +21,19 @@
4	#include <stdlib.h>
5	#include <stdint.h>
6	#include <stdio.h>
7	+#if defined(__FreeBSD__)
8	+#include <sys/types.h>
9	+#include <sys/endian.h>
10	+#define bswap_16 bswap16
11	+#define bswap_32 bswap32
12	+#define bswap_64 bswap64
13	+#define __bswap_16 bswap16
14	+#define __bswap_32 bswap32
15	+#define __bswap_64 bswap64
16	+#define NT_GNU_BUILD_ID 3
17	+#else
18	#include <byteswap.h>
19	+#endif
20	#include <elf.h>
21	#include <lttng/ust-endian.h>
22

Lines 1-30 Link Here

(-)b/sysutils/lttng-ust/files/patch-include_lttng_ust-tracepoint-event.h (-18 / +10 lines)
1	--- include/lttng/ust-tracepoint-event.h.orig 2016-11-29 01:46:24 UTC	1	--- include/lttng/ust-tracepoint-event.h.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ include/lttng/ust-tracepoint-event.h	2	+++ include/lttng/ust-tracepoint-event.h 2022-04-07 08:12:24.030383000 +0000
3	@@ -28,7 +28,19 @@	3	@@ -14,6 +14,11 @@
4	#include <lttng/ringbuffer-config.h>	4	#include <lttng/ust-arch.h>
5	#include <lttng/ust-compiler.h>	5	#include <lttng/ust-compiler.h>
6	#include <lttng/tracepoint.h>	6	#include <lttng/tracepoint.h>
7	+#if defined(__FreeBSD__)	7	+#if defined(__FreeBSD__)
8	+#include <sys/types.h>	8	+#include <sys/types.h>
9	+#include <sys/endian.h>	9	+#include <sys/endian.h>
10	+#define bswap_16 bswap16
11	+#define bswap_32 bswap32
12	+#define bswap_64 bswap64
13	+#define __bswap_16 bswap16
14	+#define __bswap_32 bswap32
15	+#define __bswap_64 bswap64
16	+#define NT_GNU_BUILD_ID 3	10	+#define NT_GNU_BUILD_ID 3
17	+#else
18	#include <byteswap.h>
19	+#endif	11	+#endif
		12	#include <lttng/ust-endian.h>
		13	#include <lttng/ust-api-compat.h>
20	#include <string.h>	14	#include <string.h>
		15	@@ -1033,6 +1038,7 @@ void lttng_ust__event_probe__##_provider##___##_name(L
21		16
22	#define __LTTNG_UST_NULL_STRING "(null)"	17	/* Reset all macros within LTTNG_UST_TRACEPOINT_EVENT */
23	@@ -941,6 +950,7 @@ static const struct lttng_event_desc __e
24
25	/* Reset all macros within TRACEPOINT_EVENT */
26	#include <lttng/ust-tracepoint-event-reset.h>	18	#include <lttng/ust-tracepoint-event-reset.h>
27	+#include <lttng/ust-events.h>	19	+#include <lttng/ust-events.h>
28		20
29	#undef TRACEPOINT_EVENT_INSTANCE	21	/*
30	#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \	22	* Declare _loglevel___##__provider##___##__name as non-static, with

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c (-31 lines)
1	--- liblttng-ust-ctl/ustctl.c.orig 2016-11-29 01:46:24 UTC
2	+++ liblttng-ust-ctl/ustctl.c
3	@@ -23,7 +23,19 @@
4	#include <lttng/ust-abi.h>
5	#include <lttng/ust-events.h>
6	#include <sys/mman.h>
7	+#if defined(__FreeBSD__)
8	+#include <sys/types.h>
9	+#include <sys/endian.h>
10	+#define bswap_16 bswap16
11	+#define bswap_32 bswap32
12	+#define bswap_64 bswap64
13	+#define __bswap_16 bswap16
14	+#define __bswap_32 bswap32
15	+#define __bswap_64 bswap64
16	+#define NT_GNU_BUILD_ID 3
17	+#else
18	#include <byteswap.h>
19	+#endif
20
21	#include <usterr-signal-safe.h>
22	#include <ust-comm.h>
23	@@ -76,7 +88,7 @@ extern void lttng_ring_buffer_client_discard_exit(void
24	extern void lttng_ring_buffer_client_discard_rt_exit(void);
25	extern void lttng_ring_buffer_metadata_client_exit(void);
26
27	-volatile enum ust_loglevel ust_loglevel;
28	+extern volatile enum ust_loglevel ust_loglevel;
29
30	int ustctl_release_handle(int sock, int handle)
31	{

Removed Link Here

(-)a/sysutils/lttng-ust/files/patch-liblttng-ust_compat.h (-20 lines)
1	--- liblttng-ust/compat.h.orig 2016-11-29 01:46:24 UTC
2	+++ liblttng-ust/compat.h
3	@@ -73,9 +73,15 @@ void lttng_ust_getprocname(char *name)
4	}
5
6	/*
7	- * If pthread_set_name_np is available.
8	+ * If pthread_setname_np or pthread_set_name_np is available.
9	*/
10	-#ifdef HAVE_PTHREAD_SET_NAME_NP
11	+#ifdef HAVE_PTHREAD_SETNAME_NP
12	+static inline
13	+int lttng_pthread_setname_np(pthread_t thread, const char *name)
14	+{
15	+ return pthread_setname_np(thread, name);
16	+}
17	+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
18	static inline
19	int lttng_pthread_setname_np(pthread_t thread, const char *name)
20	{

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-m4_libtool.m4 (+157 lines)
1	--- m4/libtool.m4.orig 2022-03-25 17:46:41.000000000 +0000
2	+++ m4/libtool.m4 2022-04-07 08:12:29.678317000 +0000
3	@@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([
4	cat <<_LT_EOF >> "$cfgfile"
5	#! $SHELL
6	# Generated automatically by $as_me ($PACKAGE) $VERSION
7	+# Libtool was configured on host `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`:
8	# NOTE: Changes made to this file will be lost: look at ltmain.sh.
9
10	# Provide generalized library-building support services.
11	@@ -2886,18 +2887,6 @@ linux* \| kbsd-gnu \| kopensolaris-gnu \| gnu)
12	dynamic_linker='GNU/Linux ld.so'
13	;;
14
15	-netbsdelf*-gnu)
16	- version_type=linux
17	- need_lib_prefix=no
18	- need_version=no
19	- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
20	- soname_spec='${libname}${release}${shared_ext}$major'
21	- shlibpath_var=LD_LIBRARY_PATH
22	- shlibpath_overrides_runpath=no
23	- hardcode_into_libs=yes
24	- dynamic_linker='NetBSD ld.elf_so'
25	- ;;
26	-
27	netbsd*)
28	version_type=sunos
29	need_lib_prefix=no
30	@@ -3557,7 +3546,7 @@ linux* \| kbsd-gnu \| kopensolaris-gnu \| gnu)
31	lt_cv_deplibs_check_method=pass_all
32	;;
33
34	-netbsd* \| netbsdelf*-gnu)
35	+netbsd*)
36	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ > /dev/null; then
37	lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+\|_pic\.a)$'
38	else
39	@@ -4063,8 +4052,7 @@ _LT_EOF
40	if AC_TRY_EVAL(ac_compile); then
41	# Now try to grab the symbols.
42	nlist=conftest.nm
43	- $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
44	- if eval "$NM" conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
45	+ if AC_TRY_EVAL(NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
46	# Try sorting and uniquifying the output.
47	if sort "$nlist" \| uniq > "$nlist"T; then
48	mv -f "$nlist"T "$nlist"
49	@@ -4436,7 +4424,7 @@ m4_if([$1], [CXX], [
50	;;
51	esac
52	;;
53	- netbsd* \| netbsdelf*-gnu)
54	+ netbsd*)
55	;;
56	qnx \| nto)
57	# QNX uses GNU C++, but need to define -shared option too, otherwise
58	@@ -4948,9 +4936,6 @@ m4_if([$1], [CXX], [
59	;;
60	esac
61	;;
62	- linux* \| kbsd-gnu \| gnu*)
63	- _LT_TAGVAR(link_all_deplibs, $1)=no
64	- ;;
65	*)
66	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience \| $global_symbol_pipe \| $SED '\''s/.* //'\'' \| sort \| uniq > $export_symbols'
67	;;
68	@@ -5013,9 +4998,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
69	openbsd* \| bitrig*)
70	with_gnu_ld=no
71	;;
72	- linux* \| kbsd-gnu \| gnu*)
73	- _LT_TAGVAR(link_all_deplibs, $1)=no
74	- ;;
75	esac
76
77	_LT_TAGVAR(ld_shlibs, $1)=yes
78	@@ -5270,7 +5252,7 @@ _LT_EOF
79	fi
80	;;
81
82	- netbsd* \| netbsdelf*-gnu)
83	+ netbsd*)
84	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
85	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
86	wlarc=
87	@@ -5791,7 +5773,6 @@ _LT_EOF
88	if test yes = "$lt_cv_irix_exported_symbol"; then
89	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
90	fi
91	- _LT_TAGVAR(link_all_deplibs, $1)=no
92	else
93	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
94	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
95	@@ -5813,7 +5794,7 @@ _LT_EOF
96	esac
97	;;
98
99	- netbsd* \| netbsdelf*-gnu)
100	+ netbsd*)
101	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
102	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
103	else
104	@@ -6439,7 +6420,7 @@ if test yes != "$_lt_caught_CXX_error"; then
105	# Commands to make compiler produce verbose output that lists
106	# what "hidden" libraries, object files and flags are used when
107	# linking a shared library.
108	- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
109	+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
110
111	else
112	GXX=no
113	@@ -6814,7 +6795,7 @@ if test yes != "$_lt_caught_CXX_error"; then
114	# explicitly linking system object files so we need to strip them
115	# from the output so that they don't get included in the library
116	# dependencies.
117	- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
118	+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
119	;;
120	*)
121	if test yes = "$GXX"; then
122	@@ -6879,7 +6860,7 @@ if test yes != "$_lt_caught_CXX_error"; then
123	# explicitly linking system object files so we need to strip them
124	# from the output so that they don't get included in the library
125	# dependencies.
126	- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
127	+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
128	;;
129	*)
130	if test yes = "$GXX"; then
131	@@ -7218,7 +7199,7 @@ if test yes != "$_lt_caught_CXX_error"; then
132	# Commands to make compiler produce verbose output that lists
133	# what "hidden" libraries, object files and flags are used when
134	# linking a shared library.
135	- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
136	+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
137
138	else
139	# FIXME: insert proper C++ library support
140	@@ -7302,7 +7283,7 @@ if test yes != "$_lt_caught_CXX_error"; then
141	# Commands to make compiler produce verbose output that lists
142	# what "hidden" libraries, object files and flags are used when
143	# linking a shared library.
144	- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
145	+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
146	else
147	# g++ 2.7 appears to require '-G' NOT '-shared' on this
148	# platform.
149	@@ -7313,7 +7294,7 @@ if test yes != "$_lt_caught_CXX_error"; then
150	# Commands to make compiler produce verbose output that lists
151	# what "hidden" libraries, object files and flags are used when
152	# linking a shared library.
153	- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
154	+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
155	fi
156
157	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-src_common_elf.h (+14 lines)
1	--- src/common/elf.h.orig 2022-03-25 15:37:17.000000000 +0000
2	+++ src/common/elf.h 2022-04-07 08:12:24.040730000 +0000
3	@@ -10,6 +10,11 @@
4	#include <stdlib.h>
5	#include <stdint.h>
6	#include <stdio.h>
7	+#if defined(__FreeBSD__)
8	+#include <sys/types.h>
9	+#include <sys/endian.h>
10	+#define NT_GNU_BUILD_ID 3
11	+#endif
12	#include <elf.h>
13
14	#include <lttng/ust-endian.h>

Added Link Here

(-)b/sysutils/lttng-ust/files/patch-src_lib_lttng-ust-ctl_ustctl.c (+14 lines)
1	--- src/lib/lttng-ust-ctl/ustctl.c.orig 2022-03-25 15:37:22.000000000 +0000
2	+++ src/lib/lttng-ust-ctl/ustctl.c 2022-04-07 08:12:24.043859000 +0000
3	@@ -8,6 +8,11 @@
4	#include <stdint.h>
5	#include <string.h>
6	#include <sys/mman.h>
7	+#if defined(__FreeBSD__)
8	+#include <sys/types.h>
9	+#include <sys/endian.h>
10	+#define NT_GNU_BUILD_ID 3
11	+#endif
12	#include <unistd.h>
13	#include <sys/types.h>
14	#include <sys/socket.h>

Lines 1-84 Link Here

(-)b/sysutils/lttng-ust/pkg-plist (-38 / +50 lines)
1	bin/lttng-gen-tp	1	bin/lttng-gen-tp
2	include/lttng/align.h	2	include/lttng/tp/lttng-ust-tracef.h
3	include/lttng/bug.h	3	include/lttng/tp/lttng-ust-tracelog.h
4	include/lttng/lttng-ust-tracef.h
5	include/lttng/lttng-ust-tracelog.h
6	include/lttng/ringbuffer-abi.h
7	include/lttng/ringbuffer-config.h
8	include/lttng/tracef.h	4	include/lttng/tracef.h
9	include/lttng/tracelog.h	5	include/lttng/tracelog.h
10	include/lttng/tracepoint-event.h	6	include/lttng/tracepoint-event.h
11	include/lttng/tracepoint-rcu.h	7	include/lttng/tracepoint-rcu.h
12	include/lttng/tracepoint-types.h	8	include/lttng/tracepoint-types.h
13	include/lttng/tracepoint.h	9	include/lttng/tracepoint.h
		10	include/lttng/urcu/pointer.h
		11	include/lttng/urcu/static/pointer.h
		12	include/lttng/urcu/static/urcu-ust.h
		13	include/lttng/urcu/urcu-ust.h
14	include/lttng/ust-abi.h	14	include/lttng/ust-abi.h
		15	include/lttng/ust-api-compat.h
		16	include/lttng/ust-arch.h
		17	include/lttng/ust-cancelstate.h
15	include/lttng/ust-clock.h	18	include/lttng/ust-clock.h
		19	include/lttng/ust-common.h
16	include/lttng/ust-compiler.h	20	include/lttng/ust-compiler.h
17	include/lttng/ust-config.h	21	include/lttng/ust-config.h
18	include/lttng/ust-ctl.h	22	include/lttng/ust-ctl.h
19	include/lttng/ust-elf.h
20	include/lttng/ust-endian.h	23	include/lttng/ust-endian.h
21	include/lttng/ust-error.h	24	include/lttng/ust-error.h
22	include/lttng/ust-events.h	25	include/lttng/ust-events.h
		26	include/lttng/ust-fork.h
23	include/lttng/ust-getcpu.h	27	include/lttng/ust-getcpu.h
		28	include/lttng/ust-libc-wrapper.h
		29	include/lttng/ust-ringbuffer-context.h
		30	include/lttng/ust-sigbus.h
		31	include/lttng/ust-thread.h
24	include/lttng/ust-tracepoint-event-nowrite.h	32	include/lttng/ust-tracepoint-event-nowrite.h
25	include/lttng/ust-tracepoint-event-reset.h	33	include/lttng/ust-tracepoint-event-reset.h
26	include/lttng/ust-tracepoint-event-write.h	34	include/lttng/ust-tracepoint-event-write.h
27	include/lttng/ust-tracepoint-event.h	35	include/lttng/ust-tracepoint-event.h
28	include/lttng/ust-tracer.h	36	include/lttng/ust-tracer.h
		37	include/lttng/ust-utils.h
29	include/lttng/ust-version.h	38	include/lttng/ust-version.h
30	include/lttng/ust.h	39	lib/liblttng-ust-common.so
31	lib/liblttng-ust-ctl.a	40	lib/liblttng-ust-common.so.1
		41	lib/liblttng-ust-common.so.1.0.0
32	lib/liblttng-ust-ctl.so	42	lib/liblttng-ust-ctl.so
33	lib/liblttng-ust-ctl.so.2	43	lib/liblttng-ust-ctl.so.5
34	lib/liblttng-ust-ctl.so.2.0.0	44	lib/liblttng-ust-ctl.so.5.0.0
35	lib/liblttng-ust-cyg-profile-fast.a
36	lib/liblttng-ust-cyg-profile-fast.so	45	lib/liblttng-ust-cyg-profile-fast.so
37	lib/liblttng-ust-cyg-profile-fast.so.0	46	lib/liblttng-ust-cyg-profile-fast.so.1
38	lib/liblttng-ust-cyg-profile-fast.so.0.0.0	47	lib/liblttng-ust-cyg-profile-fast.so.1.0.0
39	lib/liblttng-ust-cyg-profile.a
40	lib/liblttng-ust-cyg-profile.so	48	lib/liblttng-ust-cyg-profile.so
41	lib/liblttng-ust-cyg-profile.so.0	49	lib/liblttng-ust-cyg-profile.so.1
42	lib/liblttng-ust-cyg-profile.so.0.0.0	50	lib/liblttng-ust-cyg-profile.so.1.0.0
43	lib/liblttng-ust-dl.a
44	lib/liblttng-ust-dl.so	51	lib/liblttng-ust-dl.so
45	lib/liblttng-ust-dl.so.0	52	lib/liblttng-ust-dl.so.1
46	lib/liblttng-ust-dl.so.0.0.0	53	lib/liblttng-ust-dl.so.1.0.0
47	lib/liblttng-ust-fd.a
48	lib/liblttng-ust-fd.so	54	lib/liblttng-ust-fd.so
49	lib/liblttng-ust-fd.so.0	55	lib/liblttng-ust-fd.so.1
50	lib/liblttng-ust-fd.so.0.0.0	56	lib/liblttng-ust-fd.so.1.0.0
51	lib/liblttng-ust-fork.a
52	lib/liblttng-ust-fork.so	57	lib/liblttng-ust-fork.so
53	lib/liblttng-ust-fork.so.0	58	lib/liblttng-ust-fork.so.1
54	lib/liblttng-ust-fork.so.0.0.0	59	lib/liblttng-ust-fork.so.1.0.0
55	lib/liblttng-ust-libc-wrapper.a
56	lib/liblttng-ust-libc-wrapper.so	60	lib/liblttng-ust-libc-wrapper.so
57	lib/liblttng-ust-libc-wrapper.so.0	61	lib/liblttng-ust-libc-wrapper.so.1
58	lib/liblttng-ust-libc-wrapper.so.0.0.0	62	lib/liblttng-ust-libc-wrapper.so.1.0.0
59	lib/liblttng-ust-pthread-wrapper.a
60	lib/liblttng-ust-pthread-wrapper.so	63	lib/liblttng-ust-pthread-wrapper.so
61	lib/liblttng-ust-pthread-wrapper.so.0	64	lib/liblttng-ust-pthread-wrapper.so.1
62	lib/liblttng-ust-pthread-wrapper.so.0.0.0	65	lib/liblttng-ust-pthread-wrapper.so.1.0.0
63	lib/liblttng-ust-tracepoint.a
64	lib/liblttng-ust-tracepoint.so	66	lib/liblttng-ust-tracepoint.so
65	lib/liblttng-ust-tracepoint.so.0	67	lib/liblttng-ust-tracepoint.so.1
66	lib/liblttng-ust-tracepoint.so.0.0.0	68	lib/liblttng-ust-tracepoint.so.1.0.0
67	lib/liblttng-ust.a
68	lib/liblttng-ust.so	69	lib/liblttng-ust.so
69	lib/liblttng-ust.so.0	70	lib/liblttng-ust.so.1
70	lib/liblttng-ust.so.0.0.0	71	lib/liblttng-ust.so.1.0.0
		72	libdata/pkgconfig/lttng-ust-ctl.pc
71	libdata/pkgconfig/lttng-ust.pc	73	libdata/pkgconfig/lttng-ust.pc
72	man/man1/lttng-gen-tp.1.gz	74	man/man1/lttng-gen-tp.1.gz
73	man/man3/do_tracepoint.3.gz	75	man/man3/do_tracepoint.3.gz
74	man/man3/lttng-ust-cyg-profile.3.gz	76	man/man3/lttng-ust-cyg-profile.3.gz
75	man/man3/lttng-ust-dl.3.gz	77	man/man3/lttng-ust-dl.3.gz
76	man/man3/lttng-ust.3.gz	78	man/man3/lttng-ust.3.gz
		79	man/man3/lttng_ust_do_tracepoint.3.gz
		80	man/man3/lttng_ust_tracef.3.gz
		81	man/man3/lttng_ust_tracelog.3.gz
		82	man/man3/lttng_ust_tracepoint.3.gz
		83	man/man3/lttng_ust_tracepoint_enabled.3.gz
		84	man/man3/lttng_ust_vtracef.3.gz
		85	man/man3/lttng_ust_vtracelog.3.gz
77	man/man3/tracef.3.gz	86	man/man3/tracef.3.gz
78	man/man3/tracelog.3.gz	87	man/man3/tracelog.3.gz
79	man/man3/tracepoint.3.gz	88	man/man3/tracepoint.3.gz
80	man/man3/tracepoint_enabled.3.gz	89	man/man3/tracepoint_enabled.3.gz
81	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	90	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
		91	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
82	%%PORTDOCS%%%%DOCSDIR%%/README.md	92	%%PORTDOCS%%%%DOCSDIR%%/README.md
83	%%PORTDOCS%%%%DOCSDIR%%/examples/README	93	%%PORTDOCS%%%%DOCSDIR%%/examples/README
84	%%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/Makefile	94	%%PORTDOCS%%%%DOCSDIR%%/examples/clock-override/Makefile
Lines 100-108 man/man3/tracepoint_enabled.3.gz Link Here
100	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/Makefile	110	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/Makefile
101	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/README	111	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/README
102	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-tracef.c	112	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-tracef.c
		113	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracef/demo-vtracef.c
103	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/Makefile	114	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/Makefile
104	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/README	115	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/README
105	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-tracelog.c	116	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-tracelog.c
		117	%%PORTDOCS%%%%DOCSDIR%%/examples/demo-tracelog/demo-vtracelog.c
106	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/Makefile	118	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/Makefile
107	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/README	119	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/README
108	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/demo-trace	120	%%PORTDOCS%%%%DOCSDIR%%/examples/demo/demo-trace