From 159f6139419a7b1688e50a6c673bd7939a73395e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 12 Apr 2015 13:41:12 +0200 Subject: [PATCH] sumo: update to 0.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- utils/sumo/Makefile | 8 +++++--- utils/sumo/files/sumo.sh | 2 +- utils/sumo/patches/100-configure_fix.patch | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 utils/sumo/patches/100-configure_fix.patch 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 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.])