Accepting request 828562 from science
- Update to 2.3.2: OBS-URL: https://build.opensuse.org/request/show/828562 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/muparser?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
4eebdbd7f2
@ -1,4 +1,4 @@
|
||||
libmuparser2_2_6
|
||||
libmuparser2_3_2
|
||||
muparser-devel
|
||||
requires "libmuparser2_2_6-<targettype> = <version>"
|
||||
requires "libmuparser2_3_2-<targettype> = <version>"
|
||||
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2015-02-03 00:43:03.433735818 +0100
|
||||
Orig-From: Jan Engelhardt <jengelh@inai.de>
|
||||
Orig-Date: 2015-02-03 00:43:03.433735818 +0100
|
||||
From: Paolo Stivanin <info@paolostivanin.com>
|
||||
Date: 2020-06-17 08:54:21+0000
|
||||
|
||||
muparser broke the ABI between 2.2.3 and 2.2.4 by changing.
|
||||
The abidiff(1) report from libabigail:
|
||||
@ -12,37 +14,16 @@ The abidiff(1) report from libabigail:
|
||||
alignment changed from 64 to 32 bits
|
||||
|
||||
Work around this messup by using the full version as unique SONAME.
|
||||
---
|
||||
Makefile.in | 6 +++---
|
||||
build/autoconf/aclocal.m4 | 5 +++--
|
||||
2 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: muparser-2.2.4/Makefile.in
|
||||
===================================================================
|
||||
--- muparser-2.2.4.orig/Makefile.in
|
||||
+++ muparser-2.2.4/Makefile.in
|
||||
@@ -143,7 +143,7 @@ COND_WINDOWS_IMPLIB_1___muParser_dll___i
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.2.4.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__muParser_dll___targetsuf3 \
|
||||
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2
|
||||
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2.2.6
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -2.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@__muParser_dll___targetsuf3 = .$(SO_SUFFIX)
|
||||
Index: muparser-2.2.4/build/autoconf/aclocal.m4
|
||||
===================================================================
|
||||
--- muparser-2.2.4.orig/build/autoconf/aclocal.m4
|
||||
+++ muparser-2.2.4/build/autoconf/aclocal.m4
|
||||
@@ -1317,8 +1317,9 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
||||
SONAME_FLAG="-Wl,-soname,"
|
||||
fi
|
||||
USE_SOVERSION=1
|
||||
- USE_SOVERLINUX=1
|
||||
- USE_SOTWOSYMLINKS=1
|
||||
+ USE_SOVERLINUX=0
|
||||
+ USE_SOVERSOLARIS=1
|
||||
+ USE_SOTWOSYMLINKS=0
|
||||
;;
|
||||
diff -ru a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2020-06-17 10:52:15.574640873 +0200
|
||||
+++ b/CMakeLists.txt 2020-06-17 00:09:53.000000000 +0200
|
||||
@@ -74,7 +74,7 @@
|
||||
endif()
|
||||
set_target_properties(muparser PROPERTIES
|
||||
VERSION ${MUPARSER_VERSION}
|
||||
+ SOVERSION ${MUPARSER_VERSION}
|
||||
- SOVERSION ${MUPARSER_VERSION_MAJOR}
|
||||
)
|
||||
|
||||
*-*-solaris2* )
|
||||
# Install the export set for use with the install-tree
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
--- muparser_v134/Makefile.in.orig 2010-11-10 17:20:25.613034414 +0100
|
||||
+++ muparser_v134/Makefile.in 2010-11-10 17:20:46.068784224 +0100
|
||||
@@ -104,8 +104,8 @@
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
+@COND_DEPS_TRACKING_0@CXXC = $(CXX) $(CXXFLAGS)
|
||||
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) $(CXXFLAGS)
|
||||
@COND_DEBUG_0@DEBUG_BUILD_POSTFIX =
|
||||
@COND_DEBUG_1@DEBUG_BUILD_POSTFIX = d
|
||||
@COND_SHARED_0@__muParser_lib___depname = \
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 08:54:21 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
- Update to 2.3.2:
|
||||
* using OpenMP is now the default settings for cmake based builds
|
||||
* added optimization for trivial expressions
|
||||
* introduced a maximum length for expressions (5000 Character)
|
||||
* introduced a maximum length for identifiers (100 Characters)
|
||||
* removed the MUP_MATH_EXCEPTION macro and related functionality
|
||||
* removed ParserStack.h (replaced with std::stack)
|
||||
* removed macros for defining E and PI (replaced with a static constants)
|
||||
* the MUP_ASSERT macro is no longer removed in release builds
|
||||
for better protection against segmentation faults
|
||||
- Updated muparser-abiversion.diff as the project is now using cmake
|
||||
- Removed muparser-optflags.patch as the project is now using cmake
|
||||
and the Makefile.in file no longer exists
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 24 16:24:09 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package muparser
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,20 +17,17 @@
|
||||
|
||||
|
||||
Name: muparser
|
||||
%define lname libmuparser2_2_6
|
||||
Version: 2.2.6.1
|
||||
%define lname libmuparser2_3_2
|
||||
Version: 2.3.2
|
||||
Release: 0
|
||||
Summary: A math parser library
|
||||
License: MIT
|
||||
Group: Productivity/Scientific/Math
|
||||
URL: http://muparser.beltoforion.de/
|
||||
|
||||
Source: https://github.com/beltoforion/muparser/archive/v%{version}.tar.gz
|
||||
Patch0: muparser-abiversion.diff
|
||||
Source1: baselibs.conf
|
||||
Patch1: muparser-optflags.patch
|
||||
Patch2: muparser-abiversion.diff
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
@ -63,14 +60,12 @@ precalculating constant parts of the expression.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
sh build/autoconf/acregen.sh
|
||||
%configure --enable-samples --enable-shared
|
||||
# bakafile not parallel sife - duh
|
||||
make -j1
|
||||
%cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix}
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -f "%buildroot/%_libdir"/*.la
|
||||
%cmake_install
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d2562853d972b6ddb07af47ce8a1cdeeb8bb3fa9e8da308746de391db67897b3
|
||||
size 755653
|
||||
3
v2.3.2.tar.gz
Normal file
3
v2.3.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b35fc84e3667d432e3414c8667d5764dfa450ed24a99eeef7ee3f6647d44f301
|
||||
size 103979
|
||||
Loading…
Reference in New Issue
Block a user