diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2020-09-04 11:38:45 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2020-09-04 11:38:45 +0000 |
| commit | 65114dbd3952e702a7ffe14d876985a742bf36d9 (patch) | |
| tree | a5b1618ca523f7e9ee55e728d2657477149d456e | |
| parent | biology/mapm3: Fix build with llvm11, gcc10 (diff) | |
Fix build with -fno-common
While this makes the build process proceed past the point where the it
previously failed with -fno-common, it still fails later in the examples.
There is a comment in a README file that mentions BUILD_EXAMPLES_FROM_TREE,
but I could not find any actual reference to that parameter outside the
README file and the build failed with and without it set.
This commit is meant to document the changes require due to -no-common
and I leave the fix required in lttng-ust-2.9.0/doc/examples/gen-tp for
a later time or another committer.
The PORTREVISION is not bumped, since the build still fails for me.
| -rw-r--r-- | sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c | 9 | ||||
| -rw-r--r-- | sysutils/lttng-ust/files/patch-liblttng-ust-fd_lttng-ust-fd.c | 11 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c b/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c index 8713279d2939..e1f11765df7f 100644 --- a/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c +++ b/sysutils/lttng-ust/files/patch-liblttng-ust-ctl_ustctl.c @@ -20,3 +20,12 @@ #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) + { diff --git a/sysutils/lttng-ust/files/patch-liblttng-ust-fd_lttng-ust-fd.c b/sysutils/lttng-ust/files/patch-liblttng-ust-fd_lttng-ust-fd.c new file mode 100644 index 000000000000..b86296cb1067 --- /dev/null +++ b/sysutils/lttng-ust/files/patch-liblttng-ust-fd_lttng-ust-fd.c @@ -0,0 +1,11 @@ +--- liblttng-ust-fd/lttng-ust-fd.c.orig 2016-11-29 01:46:24 UTC ++++ liblttng-ust-fd/lttng-ust-fd.c +@@ -28,7 +28,7 @@ + #include <helper.h> + #include "usterr-signal-safe.h" + +-volatile enum ust_loglevel ust_loglevel; ++extern volatile enum ust_loglevel ust_loglevel; + + static int (*__lttng_ust_fd_plibc_close)(int fd); + |