-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some libraries were not correctly (or at all) checking for static variants if lo2s_USE_STATIC_LIBS was requested, so I fixed that.
- Loading branch information
Showing
6 changed files
with
149 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # Copyright (c) 2017, Technische Universität Dresden, Germany | ||
| # All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without modification, are permitted | ||
| # provided that the following conditions are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the above copyright notice, this list of conditions | ||
| # and the following disclaimer. | ||
| # | ||
| # 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions | ||
| # and the following disclaimer in the documentation and/or other materials provided with the | ||
| # distribution. | ||
| # | ||
| # 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse | ||
| # or promote products derived from this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR | ||
| # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
| # FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR | ||
| # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER | ||
| # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | ||
| # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| find_package(PkgConfig) | ||
|
|
||
| include(${CMAKE_CURRENT_LIST_DIR}/UnsetIfUpdated.cmake) | ||
|
|
||
| option(Audit_USE_STATIC_LIBS "Link libaudit statically" OFF) | ||
|
|
||
| UnsetIfUpdated(Audit_LIBRARIES Audit_USE_STATIC_LIBS) | ||
|
|
||
| if(PkgConfig_FOUND) | ||
| pkg_check_modules(Audit IMPORTED_TARGET audit) | ||
|
|
||
| # pkg-config does not know if Audit_STATIC_LIBRARIES really only contains | ||
| # static libraries, so use try_compile. | ||
| if(Audit_USE_STATIC_LIBS) | ||
| try_compile(BUILD_AUDIT | ||
| SOURCES "${CMAKE_CURRENT_LIST_DIR}/test_static_audit.c" | ||
| LINK_LIBRARIES ${Audit_STATIC_LIBRARIES} | ||
| COMPILE_DEFINITIONS "-static") | ||
| if(NOT BUILD_AUDIT) | ||
| set(Audit_FOUND OFF CACHE INTERNAL "") | ||
| endif() | ||
| endif() | ||
| add_library(Audit::Audit ALIAS PkgConfig::Audit) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| # Copyright (c) 2017, Technische Universität Dresden, Germany | ||
| # All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without modification, are permitted | ||
| # provided that the following conditions are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the above copyright notice, this list of conditions | ||
| # and the following disclaimer. | ||
| # | ||
| # 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions | ||
| # and the following disclaimer in the documentation and/or other materials provided with the | ||
| # distribution. | ||
| # | ||
| # 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse | ||
| # or promote products derived from this software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR | ||
| # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
| # FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR | ||
| # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER | ||
| # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | ||
| # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| find_package(PkgConfig) | ||
|
|
||
| include(${CMAKE_CURRENT_LIST_DIR}/UnsetIfUpdated.cmake) | ||
|
|
||
| option(Radare_USE_STATIC_LIBS "Link Radare statically" OFF) | ||
|
|
||
| UnsetIfUpdated(Radare_LIBRARIES Radare_USE_STATIC_LIBS) | ||
|
|
||
| if(PkgConfig_FOUND) | ||
| # Breaking API changes in 5.8.0 | ||
| pkg_check_modules(Radare IMPORTED_TARGET r_main>=5.8.0) | ||
|
|
||
| # pkg-config does not know if Radare_STATIC_LIBRARIES really only contains | ||
| # static libraries, so use try_compile. | ||
| if(Radare_USE_STATIC_LIBS) | ||
| try_compile(BUILD_RADARE | ||
| SOURCES "${CMAKE_CURRENT_LIST_DIR}/test_static_radare.c" | ||
| LINK_LIBRARIES ${Radare_STATIC_LIBRARIES} | ||
| COMPILE_DEFINITIONS "-static") | ||
| if(NOT BUILD_RADARE) | ||
| set(Radare_FOUND OFF CACHE INTERNAL "") | ||
| endif() | ||
| endif() | ||
| add_library(Radare::Radare ALIAS PkgConfig::Radare) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #include <libaudit.h> | ||
|
|
||
| int main(void) | ||
| { | ||
| audit_can_read(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #include <libr/r_lib.h> | ||
|
|
||
| int main(void) | ||
| { | ||
| r_lib_path("foo"); | ||
| } |