All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] package/libcodec2: fix build without C++
@ 2022-10-26 11:48 Thomas Petazzoni via buildroot
  0 siblings, 0 replies; only message in thread
From: Thomas Petazzoni via buildroot @ 2022-10-26 11:48 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=2a7f501bf3e31ca47e57143770684ce234d705a7
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Fix the following build failure without C++ raised since bump to version
1.0.5 in commit a380244766342aa7172dc7b572c99db322f74c38:

CMake Error at /home/autobuild/autobuild/instance-7/output-1/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message):
  The C++ compiler

    "/usr/bin/clang++"

  is not able to compile a simple test program.

Fixes:
 - http://autobuild.buildroot.net/results/30b519aa60d5baddb4015cf3608baa04a30be907

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/libcodec2/0001-update-cmake.patch | 301 ++++++++++++++++++++++++++++++
 1 file changed, 301 insertions(+)

diff --git a/package/libcodec2/0001-update-cmake.patch b/package/libcodec2/0001-update-cmake.patch
new file mode 100644
index 0000000000..e983800e27
--- /dev/null
+++ b/package/libcodec2/0001-update-cmake.patch
@@ -0,0 +1,301 @@
+From 812d69af486e608a10380ed5817b03d08c6e786a Mon Sep 17 00:00:00 2001
+From: "A. Maitland Bottoms" <bottoms@debian.org>
+Date: Sun, 17 Jul 2022 17:04:44 -0400
+Subject: [PATCH] update cmake
+
+Some minor refactoring of Codec2 build to better use CMake
+features to improve readability ans maintainability.
+
+[Retrieved from:
+https://github.com/drowe67/codec2/commit/812d69af486e608a10380ed5817b03d08c6e786a]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ CMakeLists.txt     | 48 +++++---------------------
+ src/CMakeLists.txt | 84 ++++++++++++++++++++++++----------------------
+ 2 files changed, 53 insertions(+), 79 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 54ac1f4f4..998af5ddf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,19 +5,13 @@
+ # Please report questions, comments, problems, or patches to the freetel
+ # mailing list: https://lists.sourceforge.net/lists/listinfo/freetel-codec2
+ #
+-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
+-
+-project(codec2)
+-
+-cmake_minimum_required(VERSION 3.0)
+-
+-# Set policies here, probably should move to cmake dir.
+-if(POLICY CMP0075)
+-    cmake_policy(SET CMP0075 NEW)
+-endif()
+-if(POLICY CMP0079)
+-    cmake_policy(SET CMP0079 NEW)
+-endif()
++cmake_minimum_required(VERSION 3.13)
++project(CODEC2
++  VERSION 1.0.5
++  DESCRIPTION "Next-Generation Digital Voice for Two-Way Radio"
++  HOMEPAGE_URL "https://www.rowetel.com/codec2.html"
++  LANGUAGES C
++  )
+ 
+ include(GNUInstallDirs)
+ mark_as_advanced(CLEAR
+@@ -39,23 +33,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+    "separate build directory and run cmake from there.")
+ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+ 
+-#
+-# Set project version information. This should probably be done via external
+-# file at some point.
+-#
+-set(CODEC2_VERSION_MAJOR 1)
+-set(CODEC2_VERSION_MINOR 0)
+-# Set to patch level if needed, otherwise leave FALSE.
+-# Must be positive (non-zero) if set, since 0 == FALSE in CMake.
+-set(CODEC2_VERSION_PATCH 5)
+-set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
+-# Patch level version bumps should not change API/ABI.
+-set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
+-if(CODEC2_VERSION_PATCH)
+-    set(CODEC2_VERSION "${CODEC2_VERSION}.${CODEC2_VERSION_PATCH}")
+-endif()
+-message(STATUS "codec2 version: ${CODEC2_VERSION}")
+-
+ # Set default build type
+ if(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE "Debug")
+@@ -65,6 +42,7 @@ endif()
+ if(BUILD_OSX_UNIVERSAL)
+ set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+ endif(BUILD_OSX_UNIVERSAL)
++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
+ 
+ #
+ # Find the git hash if this is a working copy.
+@@ -190,10 +168,6 @@ if (_GNU_SOURCE)
+     add_definitions(-D_GNU_SOURCE=1)
+ endif()
+ 
+-if(UNIX)
+-    set(CMAKE_REQUIRED_LIBRARIES m)
+-endif()
+-
+ check_symbol_exists(floor  math.h   HAVE_FLOOR)
+ check_symbol_exists(ceil   math.h   HAVE_CEIL)
+ check_symbol_exists(pow    math.h   HAVE_POW)
+@@ -288,11 +262,7 @@ else()
+ endif()
+ 
+ # Return the date (yyyy-mm-dd)
+-macro(DATE RESULT)
+-  execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT})
+-endmacro()
+-DATE(DATE_RESULT)
+-string(REGEX REPLACE "\n$" "" DATE_RESULT "${DATE_RESULT}")
++string(TIMESTAMP DATE_RESULT "%Y-%m-%d" UTC)
+ message(STATUS "Compilation date = XX${DATE_RESULT}XX")
+ 
+ set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${DATE_RESULT}-${FREEDV_HASH}")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 642404962..cb0990bc2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -81,7 +81,7 @@ else(CMAKE_CROSSCOMPILING)
+ # Build code generator binaries. These do not get installed.
+     # generate_codebook
+     add_executable(generate_codebook generate_codebook.c)
+-    target_link_libraries(generate_codebook m ${CMAKE_REQUIRED_LIBRARIES})
++    target_link_libraries(generate_codebook m)
+     # Make native builds available for cross-compiling.
+     export(TARGETS generate_codebook
+         FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
+@@ -238,12 +238,16 @@ set(CODEC2_PUBLIC_HEADERS
+ #
+ # Setup the codec2 library
+ #
++# Patch level version bumps should not change API/ABI.
++set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
++message(STATUS "codec2 version: ${CODEC2_VERSION}")
+ add_library(codec2 ${CODEC2_SRCS})
+ if(UNIX)
+-    target_link_libraries(codec2 m)
++    target_link_libraries(codec2 PUBLIC m)
+ endif(UNIX)
+ if(LPCNET AND lpcnetfreedv_FOUND)
+-    target_link_libraries(codec2 lpcnetfreedv)
++    target_link_libraries(codec2 PRIVATE lpcnetfreedv)
++    list(APPEND CODEC2_PUBLIC_HEADERS ${CMAKE_SOURCE_DIR}/lpcnet/src/lpcnet_freedv.h)
+ endif()
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ set_target_properties(codec2 PROPERTIES
+@@ -269,70 +273,70 @@ export(TARGETS codec2
+ )
+ 
+ add_executable(c2enc c2enc.c)
+-target_link_libraries(c2enc ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(c2enc codec2)
+ 
+ add_executable(c2dec c2dec.c)
+-target_link_libraries(c2dec ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(c2dec codec2)
+ 
+ add_executable(c2sim c2sim.c sd.c)
+-target_link_libraries(c2sim ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(c2sim codec2)
+ 
+ add_executable(fdmdv_get_test_bits fdmdv_get_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c)
+-target_link_libraries(fdmdv_get_test_bits m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fdmdv_get_test_bits m)
+ 
+ add_executable(fdmdv_mod fdmdv_mod.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c)
+-target_link_libraries(fdmdv_mod m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fdmdv_mod m)
+ 
+ add_executable(fdmdv_demod fdmdv_demod.c fdmdv.c kiss_fft.c octave.c modem_stats.c codec2_fft.c kiss_fftr.c)
+-target_link_libraries(fdmdv_demod m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fdmdv_demod m)
+ 
+ add_executable(fdmdv_put_test_bits fdmdv_put_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c)
+-target_link_libraries(fdmdv_put_test_bits m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fdmdv_put_test_bits m)
+ 
+ add_executable(fdmdv_channel fdmdv_channel.c)
+-target_link_libraries(fdmdv_channel ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fdmdv_channel codec2)
+ 
+ add_executable(insert_errors insert_errors.c)
+-target_link_libraries(insert_errors ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(insert_errors)
+ 
+ add_executable(freedv_tx freedv_tx.c)
+-target_link_libraries(freedv_tx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_tx codec2)
+ 
+ add_executable(freedv_rx freedv_rx.c)
+-target_link_libraries(freedv_rx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_rx codec2)
+ 
+ add_executable(freedv_data_raw_tx freedv_data_raw_tx.c)
+-target_link_libraries(freedv_data_raw_tx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_data_raw_tx codec2)
+ 
+ add_executable(freedv_data_raw_rx freedv_data_raw_rx.c octave.c)
+-target_link_libraries(freedv_data_raw_rx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_data_raw_rx codec2)
+ 
+ add_executable(freedv_data_tx freedv_data_tx.c)
+-target_link_libraries(freedv_data_tx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_data_tx codec2)
+ 
+ add_executable(freedv_data_rx freedv_data_rx.c)
+-target_link_libraries(freedv_data_rx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_data_rx codec2)
+ 
+ add_executable(freedv_mixed_tx freedv_mixed_tx.c)
+-target_link_libraries(freedv_mixed_tx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_mixed_tx codec2)
+ 
+ add_executable(freedv_mixed_rx freedv_mixed_rx.c)
+-target_link_libraries(freedv_mixed_rx ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(freedv_mixed_rx codec2)
+ 
+ add_executable(fsk_mod fsk_mod.c)
+-target_link_libraries(fsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fsk_mod codec2)
+ 
+ add_executable(fsk_mod_ext_vco fsk_mod_ext_vco.c)
+-target_link_libraries(fsk_mod_ext_vco m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fsk_mod_ext_vco m)
+ 
+ add_executable(fsk_demod fsk_demod.c modem_probe.c octave.c)
+-target_link_libraries(fsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fsk_demod codec2)
+ 
+ add_executable(fsk_get_test_bits fsk_get_test_bits.c)
+ target_link_libraries(fsk_get_test_bits)
+ 
+ add_executable(fsk_put_test_bits fsk_put_test_bits.c)
+-target_link_libraries(fsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fsk_put_test_bits codec2)
+ 
+ add_executable(framer framer.c)
+ target_link_libraries(framer)
+@@ -341,46 +345,46 @@ add_executable(deframer deframer.c)
+ target_link_libraries(deframer)
+ 
+ add_executable(fm_demod fm_demod.c fm.c)
+-target_link_libraries(fm_demod m ${CMAKE_REQUIRED_LIBRARIES})
++target_link_libraries(fm_demod m)
+ 
+ add_executable(cohpsk_mod cohpsk_mod.c)
+-target_link_libraries(cohpsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(cohpsk_mod codec2)
+ 
+ add_executable(ofdm_get_test_bits ofdm_get_test_bits.c)
+-target_link_libraries(ofdm_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ofdm_get_test_bits codec2)
+ 
+ add_executable(ofdm_put_test_bits ofdm_put_test_bits.c)
+-target_link_libraries(ofdm_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ofdm_put_test_bits codec2)
+ 
+ add_executable(ofdm_mod ofdm_mod.c)
+-target_link_libraries(ofdm_mod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ofdm_mod codec2)
+ 
+ add_executable(ofdm_demod ofdm_demod.c octave.c)
+-target_link_libraries(ofdm_demod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ofdm_demod codec2)
+ 
+ add_executable(fmfsk_mod fmfsk_mod.c)
+-target_link_libraries(fmfsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fmfsk_mod codec2)
+ 
+ add_executable(fmfsk_demod fmfsk_demod.c modem_probe.c octave.c)
+-target_link_libraries(fmfsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(fmfsk_demod codec2)
+ 
+ add_executable(vhf_deframe_c2 vhf_deframe_c2.c)
+-target_link_libraries(vhf_deframe_c2  ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(vhf_deframe_c2  codec2)
+ 
+ add_executable(vhf_frame_c2 vhf_frame_c2.c)
+-target_link_libraries(vhf_frame_c2  ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(vhf_frame_c2  codec2)
+ 
+ add_executable(cohpsk_demod cohpsk_demod.c octave.c)
+-target_link_libraries(cohpsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(cohpsk_demod codec2)
+ 
+ add_executable(cohpsk_get_test_bits cohpsk_get_test_bits.c)
+-target_link_libraries(cohpsk_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(cohpsk_get_test_bits codec2)
+ 
+ add_executable(cohpsk_put_test_bits cohpsk_put_test_bits.c octave.c)
+-target_link_libraries(cohpsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(cohpsk_put_test_bits codec2)
+ 
+ add_executable(ch ch.c)
+-target_link_libraries(ch ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ch codec2)
+ 
+ add_executable(tollr tollr.c)
+ 
+@@ -388,10 +392,10 @@ add_executable(ldpc_noise ldpc_noise.c)
+ target_link_libraries(ldpc_noise m)
+ 
+ add_executable(ldpc_enc ldpc_enc.c)
+-target_link_libraries(ldpc_enc ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ldpc_enc codec2)
+ 
+ add_executable(ldpc_dec ldpc_dec.c)
+-target_link_libraries(ldpc_dec ${CMAKE_REQUIRED_LIBRARIES} codec2)
++target_link_libraries(ldpc_dec codec2)
+ 
+ install(TARGETS codec2 EXPORT codec2-config
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] only message in thread
only message in thread, other threads:[~2022-10-26 11:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 11:48 [Buildroot] [git commit] package/libcodec2: fix build without C++ Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.