Skip to content

Commit

Permalink
sumo: fix compilation with ccache
Browse files Browse the repository at this point in the history
sumo's builtin support for ccache doesn't work well with the one in
base. Remove it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Dec 6, 2020
1 parent 2ef9701 commit bd33076
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion utils/sumo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=sumo
PKG_VERSION:=1.7.0
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sumo
Expand Down
15 changes: 15 additions & 0 deletions utils/sumo/patches/010-ccache.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,12 +29,6 @@ project(SUMO)
set(PACKAGE_VERSION "1.7.0")
cmake_minimum_required(VERSION 3.1)

-find_program(CCACHE_FOUND "ccache")
-if (CCACHE_FOUND AND CCACHE_SUPPORT)
- message(STATUS "Enabling ccache")
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache")
-endif()
-
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake_modules/")

0 comments on commit bd33076

Please sign in to comment.