Skip to contentSkip to conversation

atk: fix static build

PATCH New Fabrice Fontaine 2 participants 4 messages Jan 10, 2019 – Jan 11, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 atk: fix static build

Use library instead of shared_library to allow the user to build a static libatk library

Fixes:
- http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202

---
 ...n.build-replace-shared_library-by-library.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch
package/atk/0001-atk-meson.build-replace-shared_library-by-library.patch new file +33 -0
new file mode 100644
index 0000000000..6260cca89f
@@ -0,0 +1,33 @@
+From da08587d9a57b45cc8a76cb31390c79c1199959b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Thu, 10 Jan 2019 10:13:03 +0100
+Subject: [PATCH] atk/meson.build: replace shared_library by library
+
+Use library instead of shared_library to allow the user to build a
+static libatk library
+
+Fixes:
+ - http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://gitlab.gnome.org/GNOME/atk/merge_requests/11]
+---
+ atk/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atk/meson.build b/atk/meson.build
+index 69ba6c5..0ad67e5 100644
+--- a/atk/meson.build
++++ b/atk/meson.build
+@@ -122,7 +122,7 @@ endif
+ 
+ atk_inc = include_directories('.')
+ 
+-libatk = shared_library('atk- at 0@'.format(atk_api_version),
++libatk = library('atk- at 0@'.format(atk_api_version),
+                         sources: atk_sources + atk_enums + atk_marshals,
+                         soversion: atk_soversion,
+                         version: atk_libversion,
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 atk: fix static build

Hello,

Quoted 7 lines · Fabrice Fontaine

Use library instead of shared_library to allow the user to build a static libatk library

Fixes:
- http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202

Thanks! Does this work properly when BR2_STATIC_SHARED_LIBS=y, i.e when we want both a shared and a static variant of the library to be generated ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 atk: fix static build

Dear Thomas,

Le ven. 11 janv. 2019 ? 09:33, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 7 lines

Hello,

Quoted 3 lines · Fabrice Fontaine

Use library instead of shared_library to allow the user to build a static libatk library

Quoted 8 lines
Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/347a37dd2585974bdbf3bf99158e8ee9127d1202

Thanks! Does this work properly when BR2_STATIC_SHARED_LIBS=y, i.e when we want both a shared and a static variant of the library to be generated ?

Yes, here is an extract of the library function definition from
https://mesonbuild.com/Reference-manual.html: "Builds a library that is either static, shared or both depending on the value of default_library user option. You should use this instead of shared_library, static_library or both_libraries most of the time."

Quoted 8 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 atk: fix static build

Hello,

Quoted 8 lines · Fabrice Fontaine
Quoted 3 lines

Thanks! Does this work properly when BR2_STATIC_SHARED_LIBS=y, i.e when we want both a shared and a static variant of the library to be generated ?

Yes, here is an extract of the library function definition from
https://mesonbuild.com/Reference-manual.html: "Builds a library that is either static, shared or both depending on the value of default_library user option. You should use this instead of shared_library, static_library or both_libraries most of the time."

Great, thanks for the confirmation!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com