Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

elektra: fix compilation with external iconv

Browse source 
Patch mostly taken from hidapi.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-06-09 15:33:02 -07:00
parent 994f497e9f
commit 8788cd7c84
2 changed files with 113 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/elektra/Makefile
View file

@ -15,7 +15,7 @@ PKG_NAME:=elektra
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.md
PKG_VERSION:=0.9.7
PKG_RELEASE:=1
PKG_RELEASE:=3
# Use this for official releasees
PKG_HASH:=12b7b046004db29317b7b937dc794abf719c400ba3115af8d41849127b562681
@ -311,8 +311,6 @@ CMAKE_OPTIONS += \
-DKDB_DEFAULT_STORAGE=toml \
-DENABLE_OPTIMIZATIONS=OFF \
-DPLUGINS="ALL;-gpgme;-multifile;-simpleini" \
-DIconv_INCLUDE_DIR="$(ICONV_PREFIX)/include" \
-DIconv_LIBRARY="$(ICONV_PREFIX)/lib/libiconv.$(if $(CONFIG_BUILD_NLS),so,a)" \
-DBINDINGS="MAINTAINED;-intercept_env;-intercept_fs;-io_glib"
define Package/libelektra-core/install

112
libs/elektra/patches/010-iconv.patch Normal file
View file

@ -0,0 +1,112 @@
--- a/src/plugins/filecheck/CMakeLists.txt
+++ b/src/plugins/filecheck/CMakeLists.txt
@@ -2,19 +2,45 @@ include (LibAddMacros)
if (DEPENDENCY_PHASE)
find_package (Iconv QUIET)
- if (NOT Iconv_FOUND)
- remove_plugin (filecheck "Cannot find iconv library")
- endif ()
-
if (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
# See also: https://cirrus-ci.com/task/5751822404288512?command=tests#L237-L239
remove_plugin (filecheck "the unit test of the plugin fails on FreeBSD if ASan is active")
endif (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
endif ()
-add_plugin (
- filecheck
- SOURCES filecheck.h filecheck.c
- INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
- LINK_LIBRARIES ${Iconv_LIBRARIES}
- ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
+if(Iconv_FOUND)
+ add_plugin (
+ filecheck
+ SOURCES filecheck.h filecheck.c
+ INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Iconv_LIBRARIES}
+ ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
+else()
+ # Sometime the build environment is not setup
+ # in a way CMake can find Iconv on its own by default.
+ # But if we simply link against iconv (-liconv), the build may succeed
+ # due to other compiler/link flags.
+ set(CMAKE_REQUIRED_LIBRARIES "iconv")
+ check_c_source_compiles("
+ #include <stddef.h>
+ #include <iconv.h>
+ int main() {
+ char *a, *b;
+ size_t i, j;
+ iconv_t ic;
+ ic = iconv_open(\"to\", \"from\");
+ iconv(ic, &a, &i, &b, &j);
+ iconv_close(ic);
+ }
+ "
+ Iconv_EXPLICITLY_AT_ENV)
+ if(Iconv_EXPLICITLY_AT_ENV)
+ add_plugin (
+ filecheck
+ SOURCES filecheck.h filecheck.c
+ LINK_LIBRARIES iconv
+ ADD_TEST INSTALL_TEST_DATA COMPONENT libelektra${SO_VERSION}-extra)
+ else()
+ remove_plugin (filecheck "Cannot find iconv library")
+ endif()
+endif()
--- a/src/plugins/iconv/CMakeLists.txt
+++ b/src/plugins/iconv/CMakeLists.txt
@@ -5,15 +5,41 @@ if (DEPENDENCY_PHASE)
# See also: https://cirrus-ci.com/task/5751822404288512?command=tests#L253-L255
remove_plugin (iconv "the unit test of the plugin fails on FreeBSD if ASan is active")
endif (ENABLE_ASAN AND CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-
- if (NOT Iconv_FOUND)
- remove_plugin (iconv "Cannot find iconv library")
- endif ()
endif ()
-add_plugin (
- iconv
- SOURCES conv.h iconv.c
- INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
- LINK_LIBRARIES ${Iconv_LIBRARIES}
- ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
+if(Iconv_FOUND)
+ add_plugin (
+ iconv
+ SOURCES conv.h iconv.c
+ INCLUDE_DIRECTORIES ${Iconv_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Iconv_LIBRARIES}
+ ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
+else()
+ # Sometime the build environment is not setup
+ # in a way CMake can find Iconv on its own by default.
+ # But if we simply link against iconv (-liconv), the build may succeed
+ # due to other compiler/link flags.
+ set(CMAKE_REQUIRED_LIBRARIES "iconv")
+ check_c_source_compiles("
+ #include <stddef.h>
+ #include <iconv.h>
+ int main() {
+ char *a, *b;
+ size_t i, j;
+ iconv_t ic;
+ ic = iconv_open(\"to\", \"from\");
+ iconv(ic, &a, &i, &b, &j);
+ iconv_close(ic);
+ }
+ "
+ Iconv_EXPLICITLY_AT_ENV)
+ if(Iconv_EXPLICITLY_AT_ENV)
+ add_plugin (
+ iconv
+ SOURCES conv.h iconv.c
+ LINK_LIBRARIES iconv
+ ADD_TEST TEST_README COMPONENT libelektra${SO_VERSION}-extra)
+ else()
+ remove_plugin (iconv "Cannot find iconv library")
+ endif()
+endif()