diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-09-24 16:57:40 -0700 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2022-09-29 19:33:17 +0200 |
| commit | 3848cf458ef998fc9971edd6a01cc9cdb43fbef9 (patch) | |
| tree | f0fa3d5fa71d9e98fb0bf0c920cfdba502815507 /tools/cmake | |
| parent | 89df3589e6237e5ad9b5cdd9f87c82987b200e37 (diff) | |
| download | upstream-3848cf458ef998fc9971edd6a01cc9cdb43fbef9.tar.gz upstream-3848cf458ef998fc9971edd6a01cc9cdb43fbef9.tar.bz2 upstream-3848cf458ef998fc9971edd6a01cc9cdb43fbef9.zip | |
tools/cmake: Build without some included libs
Saves a little bit of time when compiling cmake.
Added patches to fix searching liblzma and zlib. The issue is that
because pkgconfig is not used, the system libraries get used.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools/cmake')
| -rw-r--r-- | tools/cmake/Makefile | 6 | ||||
| -rw-r--r-- | tools/cmake/patches/110-liblzma.patch | 17 | ||||
| -rw-r--r-- | tools/cmake/patches/140-zlib.patch | 20 |
3 files changed, 43 insertions, 0 deletions
diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index a0695c7d62..2d20113a39 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -32,8 +32,14 @@ HOST_CONFIGURE_VARS += \ HOST_CONFIGURE_ARGS := \ $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \ --prefix="$(STAGING_DIR_HOST)" \ + --system-expat \ + --system-liblzma \ + --system-zlib \ + --system-zstd \ --generator=Ninja +HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOST)/lib + define Host/Compile/Default +$(NINJA) -C $(HOST_BUILD_DIR) $(1) endef diff --git a/tools/cmake/patches/110-liblzma.patch b/tools/cmake/patches/110-liblzma.patch new file mode 100644 index 0000000000..e98dd5ade7 --- /dev/null +++ b/tools/cmake/patches/110-liblzma.patch @@ -0,0 +1,17 @@ +--- a/Modules/FindLibLZMA.cmake ++++ b/Modules/FindLibLZMA.cmake +@@ -43,7 +43,13 @@ This module will set the following varia + version number as a string (ex: "5.0.3") + #]=======================================================================] + +-find_path(LIBLZMA_INCLUDE_DIR lzma.h ) ++if(UNIX) ++ find_package(PkgConfig QUIET) ++ pkg_search_module(PC_liblzma liblzma) ++endif() ++ ++find_path(LIBLZMA_INCLUDE_DIR lzma.h HINTS ${PC_liblzma_INCLUDEDIR} ${PC_liblzma_INCLUDE_DIRS}) ++find_library(LIBLZMA_LIBRARY NAMES lzma HINTS ${PC_liblzma_LIBDIR} ${PC_liblzma_LIBRARY_DIRS}) + if(NOT LIBLZMA_LIBRARY) + find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma NAMES_PER_DIR PATH_SUFFIXES lib) + find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad NAMES_PER_DIR PATH_SUFFIXES lib) diff --git a/tools/cmake/patches/140-zlib.patch b/tools/cmake/patches/140-zlib.patch new file mode 100644 index 0000000000..f79801c8a5 --- /dev/null +++ b/tools/cmake/patches/140-zlib.patch @@ -0,0 +1,20 @@ +--- a/Modules/FindZLIB.cmake ++++ b/Modules/FindZLIB.cmake +@@ -85,10 +85,13 @@ else() + set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd) + endif() + +-# Try each search configuration. +-foreach(search ${_ZLIB_SEARCHES}) +- find_path(ZLIB_INCLUDE_DIR NAMES zlib.h ${${search}} PATH_SUFFIXES include) +-endforeach() ++if(UNIX) ++ find_package(PkgConfig QUIET) ++ pkg_search_module(PC_zlib zlib) ++endif() ++ ++find_path(ZLIB_INCLUDE_DIR zlib.h HINTS ${PC_zlib_INCLUDEDIR} ${PC_zlib_INCLUDE_DIRS}) ++find_library(ZLIB_LIBRARY NAMES z HINTS ${PC_zlib_LIBDIR} ${PC_zlib_LIBRARY_DIRS}) + + # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library + if(NOT ZLIB_LIBRARY) |