Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 644c3380f75b20a11755e7052aa632887f3eee2b Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Jul 2022 12:32:47 -0700 |
| 4 | Subject: [PATCH] cmake: Use alternate way to detect libm |
| 5 | |
| 6 | The standard package provided with MathLib cmake module does not work |
| 7 | when libm is folded into libc starting glibc 2.35+ |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 11 | |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 12 | --- |
| 13 | CMakeLists.txt | 7 ++++++- |
| 14 | contrib/fonttools/CMakeLists.txt | 2 +- |
| 15 | fontforge/CMakeLists.txt | 2 +- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 16 | fontforgeexe/CMakeLists.txt | 2 +- |
| 17 | 4 files changed, 9 insertions(+), 4 deletions(-) |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 18 | |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 20 | index e234cb6e9..284ba2d20 100644 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 21 | --- a/CMakeLists.txt |
| 22 | +++ b/CMakeLists.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 23 | @@ -115,9 +115,14 @@ else() |
| 24 | endif() |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 25 | find_package(Iconv REQUIRED) |
| 26 | find_package(LibXml2 REQUIRED) |
| 27 | -find_package(MathLib REQUIRED) |
| 28 | find_package(ZLIB REQUIRED) |
| 29 | |
| 30 | +include(CheckLibraryExists) |
| 31 | +CHECK_LIBRARY_EXISTS(m pow "" HAVE_LIB_M) |
| 32 | +if (HAVE_LIB_M) |
| 33 | + set(EXTRA_LIBS ${EXTRA_LIBS} m) |
| 34 | +endif (HAVE_LIB_M) |
| 35 | + |
| 36 | check_include_file(pthread.h HAVE_PTHREAD_H) |
| 37 | if(HAVE_PTHREAD_H) |
| 38 | find_package(Threads) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 39 | diff --git a/contrib/fonttools/CMakeLists.txt b/contrib/fonttools/CMakeLists.txt |
| 40 | index d6c698877..1608af152 100644 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 41 | --- a/contrib/fonttools/CMakeLists.txt |
| 42 | +++ b/contrib/fonttools/CMakeLists.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 43 | @@ -15,7 +15,7 @@ add_executable(woff woff.c) |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 44 | |
| 45 | target_link_libraries(acorn2sfd PRIVATE fontforge) |
| 46 | target_link_libraries(dewoff PRIVATE ZLIB::ZLIB) |
| 47 | -target_link_libraries(pcl2ttf PRIVATE MathLib::MathLib) |
| 48 | +target_link_libraries(pcl2ttf PRIVATE ${EXTRA_LIBS}) |
| 49 | target_link_libraries(ttf2eps PRIVATE fontforge) |
| 50 | target_link_libraries(woff PRIVATE ZLIB::ZLIB) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 51 | |
| 52 | diff --git a/fontforge/CMakeLists.txt b/fontforge/CMakeLists.txt |
| 53 | index 9a052f360..067ef40df 100644 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 54 | --- a/fontforge/CMakeLists.txt |
| 55 | +++ b/fontforge/CMakeLists.txt |
| 56 | @@ -237,7 +237,7 @@ target_link_libraries(fontforge |
| 57 | GLIB::GLIB |
| 58 | Intl::Intl |
| 59 | PRIVATE |
| 60 | - MathLib::MathLib |
| 61 | + ${EXTRA_LIBS} |
| 62 | Iconv::Iconv |
| 63 | ZLIB::ZLIB |
| 64 | ) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 65 | diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt |
| 66 | index e2982c39d..8829993ea 100644 |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 67 | --- a/fontforgeexe/CMakeLists.txt |
| 68 | +++ b/fontforgeexe/CMakeLists.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 69 | @@ -121,7 +121,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT) |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame] | 70 | target_link_libraries(fontforgeexe PRIVATE Python3::Python) |
| 71 | endif() |
| 72 | |
| 73 | -target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv MathLib::MathLib) |
| 74 | +target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv ${EXTRA_LIBS}) |
| 75 | install(TARGETS fontforgeexe RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 76 | |
| 77 | if(UNIX) |