Skip to contentSkip to conversation

package/libiio: do not force shared object build

PATCH New Samuel Martin 2 participants 2 messages Dec 27, 2014

lore
Share & tools
lore

Samuel Martin

author
#0 lore raw

PATCH 1/1 package/libiio: do not force shared object build

libiio correctly builds as a static library, there is no obvious reason to force the shared object build.

So, let the CMake BUILD_SHARED_LIBS variable handles the type of library built.

This libiio patch has already been submitted upstream:
https://github.com/analogdevicesinc/libiio/pull/6

Signed-off-by Samuel Martin <[email protected]>
---
 ...UILD_SHARED_LIBS-drive-the-type-of-librar.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libiio/0001-cmake-let-BUILD_SHARED_LIBS-drive-the-type-of-librar.patch
package/libiio/0001-cmake-let-BUILD_SHARED_LIBS-drive-the-type-of-librar.patch new file +29 -0
new file mode 100644
index 0000000..9ee0299
@@ -0,0 +1,29 @@
+From 4d036f3708f1f427bf91c5925394d39ef76ad96a Mon Sep 17 00:00:00 2001
+From: Samuel Martin <[email protected]>
+Date: Sat, 27 Dec 2014 16:36:50 +0100
+Subject: [PATCH] cmake: let BUILD_SHARED_LIBS drive the type of library built
+
+Do not force the type of library because some architectures (such as
+BlackFin from AnalogDevice) do not support shared object.
+
+Signed-off-by: Samuel Martin <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd82a96..393fee3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -115,7 +115,7 @@ install(FILES ${LIBIIO_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+ #set(SETUP_PY ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python/setup.py)
+ #configure_file(python/setup.py.in ${SETUP_PY} @ONLY)
+ 
+-add_library(iio SHARED ${LIBIIO_CFILES} ${LIBIIO_HEADERS})
++add_library(iio ${LIBIIO_CFILES} ${LIBIIO_HEADERS})
+ set_target_properties(iio PROPERTIES VERSION ${VERSION} SOVERSION ${LIBIIO_VERSION_MAJOR})
+ target_link_libraries(iio LINK_PRIVATE ${LIBS_TO_LINK})
+ 
+-- 
+2.2.1
+
Signature · 1 line
2.2.1
Applied
#1 lore raw

PATCH 1/1 package/libiio: do not force shared object build

Dear Samuel Martin,

Quoted 6 lines · Samuel Martin

libiio correctly builds as a static library, there is no obvious reason to force the shared object build.

So, let the CMake BUILD_SHARED_LIBS variable handles the type of library built.

Quoted 8 lines

This libiio patch has already been submitted upstream:
https://github.com/analogdevicesinc/libiio/pull/6

Signed-off-by Samuel Martin <[email protected]>
---
 ...UILD_SHARED_LIBS-drive-the-type-of-librar.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libiio/0001-cmake-let-BUILD_SHARED_LIBS-drive-the-type-of-librar.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com