From 500c519319d8d9a347b2cc4f2addb1140d42ab71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 8 May 2016 21:02:44 +0200 Subject: [PATCH] sumo: update to v0.26.0 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/patches/100-configure_fix.patch | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile index 0d98ea69cc..27b7e31bcd 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sumo -PKG_VERSION:=0.25.0 +PKG_VERSION:=0.26.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sumo -PKG_MD5SUM:=6bfc4e1ff37fe4ba5d481ddc40323529 +PKG_MD5SUM:=a3a9c5c5260bad87d1736cc7cda1cbca PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=GPL-3.0 @@ -31,6 +31,8 @@ CONFIGURE_ARGS += \ --disable-dependency-tracking \ --disable-silent-rules +TARGET_CXXFLAGS+=-fpermissive + define Package/sumo SECTION:=utils CATEGORY:=Utilities diff --git a/utils/sumo/patches/100-configure_fix.patch b/utils/sumo/patches/100-configure_fix.patch index 6fff18ca70..12d27b89ce 100644 --- a/utils/sumo/patches/100-configure_fix.patch +++ b/utils/sumo/patches/100-configure_fix.patch @@ -1,14 +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.]) + case "$host" in + x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux*) + dnl Make sure we are on architecture that supports SIMD +- if test x$CXX = xclang++; then +- CXXFLAGS="-msse2 $CXXFLAGS" +- else +- CXXFLAGS="-msse2 -mfpmath=sse $CXXFLAGS" +- fi + ;; + *-cygwin*) + AC_DEFINE([HAVE_CYGWIN], [1], [Define if compiling under cygwin])