diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-20 20:30:35 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-12-22 19:24:00 -0800 |
| commit | 8a6869ed87a4baf39c31c6a3aff2efb5bd359b43 (patch) | |
| tree | c1bd83c50dfeae9076cda201afb029978d8d6d55 | |
| parent | 55593507ab2552acd03e1e8fcdd01471bc7f509f (diff) | |
sumo: update to 1.8.0
Replace patch with simple CMAKE_OPTION.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | utils/sumo/Makefile | 9 | ||||
| -rw-r--r-- | utils/sumo/patches/010-ccache.patch | 15 |
2 files changed, 6 insertions, 18 deletions
diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile index b5586de16..5a26c96b4 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sumo -PKG_VERSION:=1.7.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.8.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sumo -PKG_HASH:=1f7a668568c92d1eeaa0e54a8af45052747accf9ba42983b21e906a80b16a9c2 +PKG_HASH:=fb0636152085153155ddb41841f0175c5f1e7989907b883f6c7453c63af49edb PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_LICENSE:=GPL-3.0-or-later @@ -40,6 +40,9 @@ define Package/sumo/description various APIs to remotely control the simulation. endef +CMAKE_OPTIONS += \ + -DCCACHE_SUPPORT=OFF + define Package/sumo/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{activitygen,dfrouter,duarouter,emissionsDrivingCycle,emissionsMap,jtrrouter,marouter,netconvert,netgenerate,od2trips,polyconvert} $(1)/usr/bin diff --git a/utils/sumo/patches/010-ccache.patch b/utils/sumo/patches/010-ccache.patch deleted file mode 100644 index fb0b89aab..000000000 --- a/utils/sumo/patches/010-ccache.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/") - |