Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8775 from neheb/sumo

Browse source 
sumo: Update to 1.1.0
This commit is contained in:
Rosen Penev 2019-04-30 11:52:11 -07:00 committed by GitHub
commit aa06af37a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
utils/sumo/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sumo PKG_NAME:=sumo
PKG_VERSION:=0.27.1 PKG_VERSION:=1.1.0
PKG_RELEASE:=1 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:=4494190bd6570646df7a020befe25bc66355377273d922753685737c0d38bfdf PKG_HASH:=68630b6879a3331683443e8044cb0a81e5919f9e4cfb80722933da85b84e542e
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
@ -25,20 +25,12 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS += \
--with-xerces=$(STAGING_DIR)/usr \
--disable-debug \
--disable-dependency-tracking \
--disable-silent-rules
TARGET_CXXFLAGS+=-fpermissive
define Package/sumo define Package/sumo
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=SUMO - Simulation of Urban MObility TITLE:=SUMO - Simulation of Urban MObility
URL:=http://sumo-sim.org/ URL:=https://sumo.dlr.de/
DEPENDS:=+libstdcpp +libxerces-c DEPENDS:=+libxerces-c
endef endef
define Package/sumo/description define Package/sumo/description
@ -50,6 +42,12 @@ define Package/sumo/description
various APIs to remotely control the simulation. various APIs to remotely control the simulation.
endef endef
CONFIGURE_ARGS += \
--with-xerces=$(STAGING_DIR)/usr \
--disable-debug \
--disable-dependency-tracking \
--disable-silent-rules
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,TraCITestClient} $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{activitygen,dfrouter,duarouter,emissionsDrivingCycle,emissionsMap,jtrrouter,marouter,netconvert,netgenerate,od2trips,polyconvert,TraCITestClient} $(1)/usr/bin

2
utils/sumo/patches/100-configure_fix.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -117,11 +117,6 @@ dnl - - - - - - - - - - - - - - - - - - @@ -87,11 +87,6 @@ dnl - - - - - - - - - - - - - - - - - -
case "$host" in case "$host" in
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*) x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*)
dnl Make sure we are on architecture that supports SIMD dnl Make sure we are on architecture that supports SIMD