Browse Source

sumo: update to 1.8.0

Replace patch with simple CMAKE_OPTION.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
8a6869ed87
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
2 changed files with 6 additions and 18 deletions
  1. +6
    -3
      utils/sumo/Makefile
  2. +0
    -15
      utils/sumo/patches/010-ccache.patch

+ 6
- 3
utils/sumo/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sumo 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:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sumo PKG_SOURCE_URL:=@SF/sumo
PKG_HASH:=1f7a668568c92d1eeaa0e54a8af45052747accf9ba42983b21e906a80b16a9c2
PKG_HASH:=fb0636152085153155ddb41841f0175c5f1e7989907b883f6c7453c63af49edb
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
@ -40,6 +40,9 @@ define Package/sumo/description
various APIs to remotely control the simulation. various APIs to remotely control the simulation.
endef endef
CMAKE_OPTIONS += \
-DCCACHE_SUPPORT=OFF
define Package/sumo/install define Package/sumo/install
$(INSTALL_DIR) $(1)/usr/bin $(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 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{activitygen,dfrouter,duarouter,emissionsDrivingCycle,emissionsMap,jtrrouter,marouter,netconvert,netgenerate,od2trips,polyconvert} $(1)/usr/bin


+ 0
- 15
utils/sumo/patches/010-ccache.patch View File

@ -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/")

Loading…
Cancel
Save