Skip to contentSkip to conversation

package/i2pd: fix static build with atomic

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 27, 2019 – Dec 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/i2pd: fix static build with atomic

Use HAVE_CXX_ATOMICS_WITHOUT_LIB and HAVE_CXX_ATOMICS64_WITHOUT_LIB variables to tell i2pd to check for atomic library and add it in $(REQUIRED_LIBRARIES) if needed

Fixes:
- http://autobuild.buildroot.org/results/dfffe21fab65b3fc81f449004a6771fd00efbc57

---
Changes v2 -> v3:
- Add missing backslash

Changes v1 -> v2 (after review of Thomas Petazzoni and Arnout Vandecappelle):
- Use i2pd variables instead of CMAKE_REQUIRED_LIBRARIES

 package/i2pd/i2pd.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/i2pd/i2pd.mk +3 -1
index de975d66a4..a064057f1f 100644
@@ -22,7 +22,9 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF
 I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+I2PD_CONF_OPTS += \
+	-DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \
+	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF
 endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
Signature · 1 line
2.24.0
#1 lore raw

PATCH v3 1/1 package/i2pd: fix static build with atomic

Fabrice, All,

On 2019-12-27 14:13 +0100, Fabrice Fontaine spake thusly:

Quoted 8 lines

Use HAVE_CXX_ATOMICS_WITHOUT_LIB and HAVE_CXX_ATOMICS64_WITHOUT_LIB variables to tell i2pd to check for atomic library and add it in $(REQUIRED_LIBRARIES) if needed

Fixes:
- http://autobuild.buildroot.org/results/dfffe21fab65b3fc81f449004a6771fd00efbc57

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 33 lines

---
Changes v2 -> v3:
- Add missing backslash

Changes v1 -> v2 (after review of Thomas Petazzoni and Arnout Vandecappelle):
- Use i2pd variables instead of CMAKE_REQUIRED_LIBRARIES

 package/i2pd/i2pd.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/i2pd/i2pd.mk +3 -1
index de975d66a4..a064057f1f 100644
@@ -22,7 +22,9 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF
 I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+I2PD_CONF_OPTS += \
+	-DHAVE_CXX_ATOMICS_WITHOUT_LIB=OFF \
+	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF
 endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
Signature · 6 lines
2.24.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'