Compare commits

..

1 commit

Author SHA1 Message Date
Jerry James
4dc0e0f2b7 Version 3.7.0 2025-11-23 13:42:22 -07:00
3 changed files with 26 additions and 28 deletions

View file

@ -1 +1 @@
SHA512 (zimpl-3.7.1.tar.gz) = a94eba1ec9d7947d30c948599092100f5f1d6be509967f947154141a7718e054e398860fbfba34bb2e0dd129f58fd168d1087023ffe3215f7d498e829e38afc9
SHA512 (zimpl-3.7.0.tar.gz) = 1bdf3255ffd453b2d885c7dc7faa9ff70491fafb72c57d054ab1e673ea634475c62c6ecc39713b67f1591e6323fe6a771c309225bcd1dd2c0192f38fe0e95887

View file

@ -1,5 +1,5 @@
--- zimpl-3.7.1/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.1/CMakeLists.txt 2026-04-03 09:07:34.324781686 -0600
--- zimpl-3.7.0/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/CMakeLists.txt 2025-11-23 13:14:26.606931058 -0700
@@ -49,8 +49,6 @@ endif()
# use C99 standard
@ -8,10 +8,10 @@
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
option(ZLIB "use ZLIB" ON)
option(SANITIZE "should sanitizers be enabled if available" OFF)
--- zimpl-3.7.1/src/CMakeLists.txt.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.1/src/CMakeLists.txt 2026-04-03 09:10:52.288477757 -0600
@@ -118,12 +118,10 @@ if(MSVC)
option(SANITIZE_ADDRESS "should the address sanitizer be enabled in debug mode if available" OFF)
--- zimpl-3.7.0/src/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/src/CMakeLists.txt 2025-11-23 13:15:22.276583290 -0700
@@ -119,12 +119,10 @@ if(MSVC)
endif()
#create zimpl with pic
@ -24,11 +24,11 @@
+add_library(libzimpl SHARED ${libsources})
+set_target_properties(libzimpl PROPERTIES
+ POSITION_INDEPENDENT_CODE on
+ VERSION 0.0.0 SOVERSION 0)
+ VERSION 0.0.0 SOVERSION 0)
target_link_libraries(libzimpl ${libs})
#create zimpl binary
@@ -138,9 +136,6 @@ endif()
@@ -141,16 +139,13 @@ endif()
set_target_properties(libzimpl PROPERTIES
OUTPUT_NAME "zimpl")
@ -38,8 +38,7 @@
include(GNUInstallDirs)
# install the header files of zimpl
@@ -150,7 +145,7 @@ if(MSVC)
endif()
install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zimpl)
# install the binary and the library to appropriate locations and add them to an export group
-install(TARGETS libzimpl zimpl libzimpl-pic EXPORT zimpl-targets
@ -56,8 +55,8 @@
FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake")
#configure the config file for the build tree
--- zimpl-3.7.1/src/zimpl/zimpllib.c.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.1/src/zimpl/zimpllib.c 2026-04-03 09:07:34.325265327 -0600
--- zimpl-3.7.0/src/zimpl/zimpllib.c.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/src/zimpl/zimpllib.c 2025-11-23 13:14:26.607519615 -0700
@@ -455,3 +455,66 @@ bool zpl_read_with_args(char** argv, int
return ret;
@ -125,8 +124,8 @@
+{
+ abort();
+}
--- zimpl-3.7.1/zimpl-config.cmake.in.orig 2026-03-31 18:33:37.000000000 -0600
+++ zimpl-3.7.1/zimpl-config.cmake.in 2026-04-03 09:07:34.325434322 -0600
--- zimpl-3.7.0/zimpl-config.cmake.in.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/zimpl-config.cmake.in 2025-11-23 13:14:26.607724336 -0700
@@ -3,7 +3,7 @@ if(NOT TARGET libzimpl)
endif()

View file

@ -1,7 +1,7 @@
%global giturl https://github.com/scipopt/zimpl
Name: zimpl
Version: 3.7.1
Version: 3.7.0
Release: %autorelease
Summary: Zuse Institut Mathematical Programming Language
@ -33,9 +33,9 @@ Patch: %{name}-test-bsearch.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
BuildSystem: cmake
BuildRequires: bison
BuildRequires: cmake
BuildRequires: flex
BuildRequires: gcc
BuildRequires: pkgconfig(gmp)
@ -74,34 +74,33 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libzimpl%{?_isa} = %{version}-%{release}
%description -n libzimpl-devel
This package contains headers and library links for developing applications
that use libzimpl.
This package contains headers and library links for developing
applications that use libzimpl.
%prep
%autosetup -p1
%conf
# Avoid warnings about obsolete invocations of grep
sed -i 's/fgrep/grep -F/' check/check.sh
%conf -p
%build
export CFLAGS='%{build_cflags} -DFREEMEM -DNO_MSHELL'
export CXXFLAGS='%{build_cxxflags} -DFREEMEM -DNO_MSHELL'
%cmake
%cmake_build
%install -a
%install
%cmake_install
mkdir -p %{buildroot}%{_mandir}/man1
cp -p doc/zimpl.man %{buildroot}%{_mandir}/man1/zimpl.1
# We do this in %%files with the %%license macro
rm -fr %{buildroot}%{_datadir}/licenses
# Help the debuginfo generator find source files
mkdir -p %{_vpath_builddir}/zimpl
ln -s ../../src/zimpl/mmlscan.l %{_vpath_builddir}/zimpl
ln -s ../../src/zimpl/mmlparse2.y %{_vpath_builddir}/zimpl
%check
# FIXME: Test qubo.zpl (qbo: lp) fails on ppc64le
%ifnarch %{power64}
%check
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
cd check
sh check.sh ../%{_vpath_builddir}/bin/zimpl
@ -116,7 +115,7 @@ cd -
%files -n libzimpl
%doc CHANGELOG README
%license LICENSE
%{_libdir}/libzimpl.so.0{,.*}
%{_libdir}/libzimpl.so.0*
%files -n libzimpl-devel
%{_includedir}/zimpl/