aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2015-04-12 13:41:12 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2015-04-12 13:42:17 +0200
commit159f6139419a7b1688e50a6c673bd7939a73395e (patch)
tree6a30f63876df99db5a8b0a7352eb81f827d370ee
parente44e5d4ad74c2c6a781a9d2a014d9870c428fc80 (diff)
sumo: update to 0.23
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-rw-r--r--utils/sumo/Makefile8
-rw-r--r--utils/sumo/files/sumo.sh2
-rw-r--r--utils/sumo/patches/100-configure_fix.patch14
3 files changed, 20 insertions, 4 deletions
diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile
index 02b8fa01e..83aa40d42 100644
--- a/utils/sumo/Makefile
+++ b/utils/sumo/Makefile
@@ -8,23 +8,25 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sumo
-PKG_VERSION:=0.22.0
+PKG_VERSION:=0.23.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sumo
-PKG_MD5SUM:=d239a3f94fdb905fdaf1648f2b71fd42
+PKG_MD5SUM:=0df95a449d44808b8d3677af086e1af1
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS += \
- --with-xerces-includes=$(STAGING_DIR)/usr/include/xercesc \
+ --with-xerces=$(STAGING_DIR)/usr \
--disable-debug \
--disable-dependency-tracking \
--disable-silent-rules
diff --git a/utils/sumo/files/sumo.sh b/utils/sumo/files/sumo.sh
index 2ae8df8c2..0f0af4db4 100644
--- a/utils/sumo/files/sumo.sh
+++ b/utils/sumo/files/sumo.sh
@@ -3,4 +3,4 @@
SUMO_HOME=/usr/share/sumo sumo-bin $@
-exit 0
+exit $?
diff --git a/utils/sumo/patches/100-configure_fix.patch b/utils/sumo/patches/100-configure_fix.patch
new file mode 100644
index 000000000..6fff18ca7
--- /dev/null
+++ b/utils/sumo/patches/100-configure_fix.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,11 +13,6 @@ AC_LANG([C++])
+
+ dnl the debug check has to be made before the program checks
+ dnl because it modifies CXXFLAGS
+-if test x$CXX = xclang++; then
+- CXXFLAGS="-msse2 $CXXFLAGS"
+-else
+- CXXFLAGS="-msse2 -mfpmath=sse $CXXFLAGS"
+-fi
+ AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],[enable sumo debugging code [default=no].])])
+ if test x$enable_debug = xyes; then
+ AC_DEFINE(_DEBUG, 1, [Define to 1 in order to enable sumo debugging code.])