Skip to contentSkip to conversation

fix: add -lurcu-common to pkg-config libs for each flavor

PATCH Applied Michael Jeanson via lttng-dev 1 participant 2 messages Oct 30, 2020 – Nov 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix: add -lurcu-common to pkg-config libs for each flavor

The urcu-common library contains common code like the write-free queue and compat code, each urcu flavor library is dynamicly linked with it.

Most but not all toolchains will automatically link an executable with a transitive depency of an explicitly linked library if said binary uses a symbol from the transitive dependency.

Since this behavior is not present in all toolchains, add '-lurcu-common' to the 'Libs' field of each flavors pkg-config file so that executables using symbols from urcu-common can be reliably linked using pkg-config.

---
 src/liburcu-bp.pc.in     | 2 +-
 src/liburcu-cds.pc.in    | 2 +-
 src/liburcu-mb.pc.in     | 2 +-
 src/liburcu-qsbr.pc.in   | 2 +-
 src/liburcu-signal.pc.in | 2 +-
 src/liburcu.pc.in        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
src/liburcu-bp.pc.in +1 -1
index c5f2355..7cba58a 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU BulletProof
 Description: A userspace RCU (read-copy-update) library, bulletproof version
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu-bp
+Libs: -L${libdir} -lurcu-common -lurcu-bp
 Cflags: -I${includedir} 
src/liburcu-cds.pc.in +1 -1
index e3d13af..1cb19b6 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU Concurrent Data Structures
 Description: Data structures leveraging RCU and atomic operations to provide efficient concurrency-aware storage
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu-cds
+Libs: -L${libdir} -lurcu-common -lurcu-cds
 Cflags: -I${includedir} 
src/liburcu-mb.pc.in +1 -1
index cd669ef..1684701 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU Memory barriers
 Description: A userspace RCU (read-copy-update) library, memory barriers version
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu-mb
+Libs: -L${libdir} -lurcu-common -lurcu-mb
 Cflags: -I${includedir} 
src/liburcu-qsbr.pc.in +1 -1
index 0732602..d123a10 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU QSBR
 Description: A userspace RCU (read-copy-update) library, quiescent state version
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu-qsbr
+Libs: -L${libdir} -lurcu-common -lurcu-qsbr
 Cflags: -I${includedir} 
src/liburcu-signal.pc.in +1 -1
index f9bc3a3..844c449 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU signal
 Description: A userspace RCU (read-copy-update) library, signal version
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu-signal
+Libs: -L${libdir} -lurcu-common -lurcu-signal
 Cflags: -I${includedir} 
src/liburcu.pc.in +1 -1
index 22bf2c8..b9f812b 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU
 Description: A userspace RCU (read-copy-update) library, standard version
 Version: @PACKAGE_VERSION@
 Requires:
-Libs: -L${libdir} -lurcu
+Libs: -L${libdir} -lurcu-common -lurcu
 Cflags: -I${includedir} 
Signature · 6 lines
2.28.0

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#1 lore raw

Merged into liburcu master, 0.11, 0.12, thanks!

Mathieu

Quoted 91 lines · ----- On Oct 30, 2020, at 3:39 PM, Michael Jeanson [email protected] wrote:

The urcu-common library contains common code like the write-free queue and compat code, each urcu flavor library is dynamicly linked with it.

Most but not all toolchains will automatically link an executable with a transitive depency of an explicitly linked library if said binary uses a symbol from the transitive dependency.

Since this behavior is not present in all toolchains, add '-lurcu-common' to the 'Libs' field of each flavors pkg-config file so that executables using symbols from urcu-common can be reliably linked using pkg-config.

---

src/liburcu-bp.pc.in     | 2 +-
src/liburcu-cds.pc.in    | 2 +-
src/liburcu-mb.pc.in     | 2 +-
src/liburcu-qsbr.pc.in   | 2 +-
src/liburcu-signal.pc.in | 2 +-
src/liburcu.pc.in        | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
src/liburcu-bp.pc.in +0 -0
index c5f2355..7cba58a 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU BulletProof

Description: A userspace RCU (read-copy-update) library, bulletproof version
Version: @PACKAGE_VERSION@
Requires:

src/liburcu-bp.pc.in +1 -1
-Libs: -L${libdir} -lurcu-bp
+Libs: -L${libdir} -lurcu-common -lurcu-bp

Cflags: -I${includedir}

src/liburcu-cds.pc.in +0 -0
index e3d13af..1cb19b6 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU Concurrent Data Structures

Description: Data structures leveraging RCU and atomic operations to provide efficient concurrency-aware storage
Version: @PACKAGE_VERSION@
Requires:

src/liburcu-cds.pc.in +1 -1
-Libs: -L${libdir} -lurcu-cds
+Libs: -L${libdir} -lurcu-common -lurcu-cds

Cflags: -I${includedir}

src/liburcu-mb.pc.in +0 -0
index cd669ef..1684701 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU Memory barriers

Description: A userspace RCU (read-copy-update) library, memory barriers version
Version: @PACKAGE_VERSION@
Requires:

src/liburcu-mb.pc.in +1 -1
-Libs: -L${libdir} -lurcu-mb
+Libs: -L${libdir} -lurcu-common -lurcu-mb

Cflags: -I${includedir}

src/liburcu-qsbr.pc.in +0 -0
index 0732602..d123a10 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU QSBR

Description: A userspace RCU (read-copy-update) library, quiescent state version
Version: @PACKAGE_VERSION@
Requires:

src/liburcu-qsbr.pc.in +1 -1
-Libs: -L${libdir} -lurcu-qsbr
+Libs: -L${libdir} -lurcu-common -lurcu-qsbr

Cflags: -I${includedir}

src/liburcu-signal.pc.in +0 -0
index f9bc3a3..844c449 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU signal

Description: A userspace RCU (read-copy-update) library, signal version
Version: @PACKAGE_VERSION@
Requires:

src/liburcu-signal.pc.in +1 -1
-Libs: -L${libdir} -lurcu-signal
+Libs: -L${libdir} -lurcu-common -lurcu-signal

Cflags: -I${includedir}

src/liburcu.pc.in +0 -0
index 22bf2c8..b9f812b 100644
@@ -7,5 +7,5 @@ Name: Userspace RCU

Description: A userspace RCU (read-copy-update) library, standard version
Version: @PACKAGE_VERSION@
Requires:

src/liburcu.pc.in +1 -1
-Libs: -L${libdir} -lurcu
+Libs: -L${libdir} -lurcu-common -lurcu

Cflags: -I${includedir}
--
2.28.0

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev