diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-12-05 20:36:26 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-12-11 08:26:42 +1000 |
| commit | a685a44749fd4f018647950f4fbebfe554bb0cae (patch) | |
| tree | 1ca2177e99cc34a6635c33b297937804106730b2 /tools/depends/target | |
| parent | 166ba0b197b8dcb301a595c6517de453556fb2de (diff) | |
[tools/depends][target] bump spdlog 1.9.2
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/libspdlog/0001-fix_fmt_version.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/libspdlog/Makefile | 8 |
2 files changed, 3 insertions, 16 deletions
diff --git a/tools/depends/target/libspdlog/0001-fix_fmt_version.patch b/tools/depends/target/libspdlog/0001-fix_fmt_version.patch deleted file mode 100644 index 1c7b86c327..0000000000 --- a/tools/depends/target/libspdlog/0001-fix_fmt_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,7 +147,7 @@ - #--------------------------------------------------------------------------------------- - if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO) - if (NOT TARGET fmt::fmt) -- find_package(fmt REQUIRED) -+ find_package(fmt 5.3.0 REQUIRED) - endif () - target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL) - target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL) diff --git a/tools/depends/target/libspdlog/Makefile b/tools/depends/target/libspdlog/Makefile index 9bbecbf461..b7d592d635 100644 --- a/tools/depends/target/libspdlog/Makefile +++ b/tools/depends/target/libspdlog/Makefile @@ -1,9 +1,9 @@ -include ../../Makefile.include -DEPS = Makefile 0001-fix_fmt_version.patch +DEPS = Makefile # lib name, version LIBNAME=spdlog -VERSION=1.5.0 +VERSION=1.9.2 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -49,10 +49,8 @@ ifeq ($(PREFIX),) @echo "ERROR: please set PREFIX to the kodi install path e.g. make PREFIX=/usr/local" @exit 1 endif - rm -rf $(PLATFORM); mkdir -p $(PLATFORM) + rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); rm -rf build; mkdir -p build - cd $(PLATFORM); patch -p1 -i ../0001-fix_fmt_version.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) |