Hello community, here is the log from the commit of package minisat for openSUSE:Factory checked in at 2019-11-04 17:16:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minisat (Old) and /work/SRC/openSUSE:Factory/.minisat.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minisat" Mon Nov 4 17:16:18 2019 rev:3 rq:745123 version:2.2.1+20180702 Changes: -------- --- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2019-07-31 14:36:25.289865450 +0200 +++ /work/SRC/openSUSE:Factory/.minisat.new.2990/minisat.changes 2019-11-04 17:16:31.932910189 +0100 @@ -1,0 +2,16 @@ +Mon Nov 04 08:39:23 UTC 2019 - jsl...@suse.com + +- Update to version 2.2.1+20180702: + * Fix linking of minisat as dependency library on MacOSX + * fixed GCC 6.3 warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] + * Specify default argument in the declaration not the friend declaration + * Fix declaration of Minisat::memUsedPeak for non-Linux systems + * Remove illegal (and not neccesary) friend definition to fix compilation under clang. + * Fixing problems with compilation with C++11 compilers +- switch to cmake + * add 0001-CMakeLists-support-different-lib-dirs.patch + * add 0001-CMakeLists-make-static-lib-optional.patch +- remove friend-declaration.patch (in upstream now) +- remove Makefile_lib_rule.patch (not needed -- cmake) + +------------------------------------------------------------------- Old: ---- Makefile_lib_rule.patch friend-declaration.patch minisat-2.2.0+20130925.tar.xz New: ---- 0001-CMakeLists-make-static-lib-optional.patch 0001-CMakeLists-support-different-lib-dirs.patch _servicedata minisat-2.2.1+20180702.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minisat.spec ++++++ --- /var/tmp/diff_new_pack.SowOtQ/_old 2019-11-04 17:16:33.476911838 +0100 +++ /var/tmp/diff_new_pack.SowOtQ/_new 2019-11-04 17:16:33.508911873 +0100 @@ -1,7 +1,7 @@ # # spec file for package minisat # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: minisat Url: http://minisat.se/MiniSat.html -Version: 2.2.0+20130925 +Version: 2.2.1+20180702 Release: 0 Summary: SAT solver License: MIT Group: Development/Tools/Other Source0: %{name}-%{version}.tar.xz -Patch0: Makefile_lib_rule.patch -Patch1: friend-declaration.patch +Patch0: 0001-CMakeLists-support-different-lib-dirs.patch +Patch1: 0001-CMakeLists-make-static-lib-optional.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: ninja BuildRequires: zlib-devel %description @@ -62,27 +64,15 @@ Headers and libraries for the minisat package. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 %build -export CXXFLAGS="%optflags" -make %{?_smp_mflags} sh lsh \ - MINISAT_REL="-D NDEBUG" \ - VERB= +%define __builder ninja +%cmake -DSTATIC_BINARIES=OFF +%make_jobs %install -make DESTDIR=%{buildroot} prefix=%{_prefix} install-headers - -# lib -install -d %{buildroot}/%{_libdir} -# links -cp -dp build/dynamic/lib/libminisat.so* %{buildroot}/%{_libdir}/ - -# binaries -install -d %{buildroot}/%{_bindir} -install -m 0755 build/dynamic/bin/%{name} %{buildroot}/%{_bindir}/%{name} +%cmake_install %post -n libminisat2 -p /sbin/ldconfig %postun -n libminisat2 -p /sbin/ldconfig @@ -91,6 +81,7 @@ %defattr(-,root,root) %doc LICENSE README %{_bindir}/%{name} +%{_bindir}/%{name}_core %files -n libminisat2 %defattr(-,root,root) ++++++ 0001-CMakeLists-make-static-lib-optional.patch ++++++ >From 295a4a7586cc1f4f867a92c864cc1c49eab0991c Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jsl...@suse.cz> Date: Mon, 4 Nov 2019 10:00:37 +0100 Subject: [PATCH] CMakeLists: make static lib optional Build static lib only if BUILD_STATIC_LIBS is specified. --- CMakeLists.txt | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e00ca0..5e493de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(minisat) # Configurable options: option(STATIC_BINARIES "Link binaries statically." ON) +option(BUILD_STATIC_LIBS "Build static library." ON) option(USE_SORELEASE "Use SORELEASE in shared library filename." ON) #-------------------------------------------------------------------------------------------------- @@ -51,11 +52,19 @@ set(MINISAT_LIB_SOURCES minisat/core/Solver.cc minisat/simp/SimpSolver.cc) -add_library(minisat-lib-static STATIC ${MINISAT_LIB_SOURCES}) -add_library(minisat-lib-shared SHARED ${MINISAT_LIB_SOURCES}) +if (BUILD_STATIC_LIBS OR STATIC_BINARIES) + add_library(minisat-lib-static STATIC ${MINISAT_LIB_SOURCES}) + target_link_libraries(minisat-lib-static ${ZLIB_LIBRARY}) + set_target_properties(minisat-lib-static PROPERTIES OUTPUT_NAME "minisat") +endif() +add_library(minisat-lib-shared SHARED ${MINISAT_LIB_SOURCES}) target_link_libraries(minisat-lib-shared ${ZLIB_LIBRARY}) -target_link_libraries(minisat-lib-static ${ZLIB_LIBRARY}) +set_target_properties(minisat-lib-shared + PROPERTIES + OUTPUT_NAME "minisat" + VERSION ${MINISAT_VERSION} + SOVERSION ${MINISAT_SOVERSION}) add_executable(minisat_core minisat/core/Main.cc) add_executable(minisat_simp minisat/simp/Main.cc) @@ -68,13 +77,6 @@ else() target_link_libraries(minisat_simp minisat-lib-shared) endif() -set_target_properties(minisat-lib-static PROPERTIES OUTPUT_NAME "minisat") -set_target_properties(minisat-lib-shared - PROPERTIES - OUTPUT_NAME "minisat" - VERSION ${MINISAT_VERSION} - SOVERSION ${MINISAT_SOVERSION}) - set_target_properties(minisat_simp PROPERTIES OUTPUT_NAME "minisat") #-------------------------------------------------------------------------------------------------- @@ -82,7 +84,12 @@ set_target_properties(minisat_simp PROPERTIES OUTPUT_NAME "minisat") set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Output directory for libraries") -install(TARGETS minisat-lib-static minisat-lib-shared minisat_core minisat_simp +if (BUILD_STATIC_LIBS) + install(TARGETS minisat-lib-static + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() + +install(TARGETS minisat-lib-shared minisat_core minisat_simp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- 2.23.0 ++++++ 0001-CMakeLists-support-different-lib-dirs.patch ++++++ >From c65ff70c7f62ca918458cacd7b3f7b5b61a2846b Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jsl...@suse.cz> Date: Mon, 4 Nov 2019 09:56:20 +0100 Subject: [PATCH] CMakeLists: support different lib dirs On 64bit systems, the usual destination for libraries is /usr/lib64, not /usr/lib. So add CMAKE_INSTALL_LIBDIR and allow overriding the the default. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 061a61a..6e00ca0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,10 +80,12 @@ set_target_properties(minisat_simp PROPERTIES OUTPUT_NAME "minisat") #-------------------------------------------------------------------------------------------------- # Installation targets: +set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Output directory for libraries") + install(TARGETS minisat-lib-static minisat-lib-shared minisat_core minisat_simp RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(DIRECTORY minisat/mtl minisat/utils minisat/core minisat/simp DESTINATION include/minisat -- 2.23.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SowOtQ/_old 2019-11-04 17:16:33.996912394 +0100 +++ /var/tmp/diff_new_pack.SowOtQ/_new 2019-11-04 17:16:34.020912420 +0100 @@ -1,11 +1,12 @@ <services> <service mode="disabled" name="tar_scm"> - <param name="url">git://github.com/niklasso/minisat.git</param> + <param name="url">git://github.com/stp/minisat.git</param> <param name="scm">git</param> - <param name="revision">master</param> <param name="filename">minisat</param> - <param name="parent-tag">releases/2.2.0</param> - <param name="versionformat">2.2.0+%cd</param> + <param name="changesgenerate">enable</param> + <param name="versionformat">@PARENT_TAG@+%cd</param> + <param name="versionrewrite-pattern">releases/(.*)</param> + <param name="versionrewrite-replacement">\1</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/stp/minisat.git</param> <param name="changesrevision">1aa1e871aad1fe2f80510b42e93f28d4fb1286a0</param></service></servicedata>++++++ minisat-2.2.0+20130925.tar.xz -> minisat-2.2.1+20180702.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/CMakeLists.txt new/minisat-2.2.1+20180702/CMakeLists.txt --- old/minisat-2.2.0+20130925/CMakeLists.txt 2013-09-25 14:16:18.000000000 +0200 +++ new/minisat-2.2.1+20180702/CMakeLists.txt 2018-07-02 03:46:34.000000000 +0200 @@ -23,6 +23,13 @@ endif() set(MINISAT_SOVERSION ${MINISAT_SOMAJOR}) +# Reference specific library paths used during linking for install +if (POLICY CMP0042) + # Enable `MACOSX_RPATH` by default. + cmake_policy(SET CMP0042 NEW) +endif() +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + #-------------------------------------------------------------------------------------------------- # Dependencies: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/appveyor.yml new/minisat-2.2.1+20180702/appveyor.yml --- old/minisat-2.2.0+20130925/appveyor.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/minisat-2.2.1+20180702/appveyor.yml 2018-07-02 03:46:34.000000000 +0200 @@ -0,0 +1,92 @@ +# branches to build +branches: + # whitelist + only: + - master + - appveyor_debug + +# Operating system (build VM template) +os: Visual Studio 2015 + +# scripts that are called at very beginning, before repo cloning +init: + - git config --global core.autocrlf input + + +# clone directory +clone_folder: c:\projects\minisat + +platform: + - x64 +# - x86 + +environment: + global: + BOOST_ROOT: C:\projects\minisat\boost_1_59_0_install + ZLIB_ROOT: C:\projects\minisat\zlib\myinstall + BUILD_TYPE: Release + MSBUILD_FLAGS: /maxcpucount /nologo + +configuration: + - Release + +build_script: + #- IF "%PLATFORM%" == "x86" ( SET BOOST_LIBRARYDIR=C:/Libraries/boost_1_59_0/lib32-msvc-14.0) + - IF "%PLATFORM%" == "x86" ( SET CMAKE_GENERATOR="Visual Studio 14 2015") + + #- IF "%PLATFORM%" == "x64" ( SET BOOST_LIBRARYDIR=C:/Libraries/boost_1_59_0/lib64-msvc-14.0) + - IF "%PLATFORM%" == "x64" ( SET CMAKE_GENERATOR="Visual Studio 14 2015 Win64") + + - echo %PLATFORM% + - echo %BOOST_LIBRARYDIR% + - echo %CMAKE_GENERATOR% + - echo %configuration% + - echo %APPVEYOR_BUILD_FOLDER% + - echo %cd% + + # zlib + # TODO check out http://stackoverflow.com/questions/10507893/libzip-with-visual-studio-2010 + - cd C:\projects\minisat + - git clone https://github.com/madler/zlib + - cd zlib + - git checkout v1.2.8 + - echo %cd% + - mkdir build + - mkdir myinstall + - cd build + - cmake -G %CMAKE_GENERATOR% -DCMAKE_INSTALL_PREFIX=%ZLIB_ROOT% .. + - if %PLATFORM%==x86 call msbuild %MSBUILD_FLAGS% /t:Build /p:Configuration=%CONFIGURATION% /p:Platform="x86" zlib.sln + - if %PLATFORM%==x64 call msbuild %MSBUILD_FLAGS% /t:Build /p:Configuration=%CONFIGURATION% /p:Platform="x64" zlib.sln + - msbuild %MSBUILD_FLAGS% INSTALL.vcxproj + - dir ..\myinstall\ + + # minisat + - cd C:\projects\minisat + - mkdir build + - mkdir myinstall + - cd build + - cmake -G %CMAKE_GENERATOR% -DCMAKE_INSTALL_PREFIX=%MINISAT_ROOT% -DZLIB_ROOT=%ZLIB_ROOT% .. + - cmake --build . --config %CONFIGURATION% + - dir ..\myinstall\ + + +build: + # project: INSTALL.vcxproj # path to Visual Studio solution or project + parallel: true + verbosity: minimal + + +# scripts to run after build +after_build: + - 7z a c:\projects\minisat\minisat.zip %APPVEYOR_BUILD_FOLDER%\build -tzip + - cd c:\projects\minisat + +artifacts: + - path: minisat.zip + name: minisat.zip + +deploy_script: + #- cd c:\projects\minisat + #- curl -T minisat.zip --user %ACCOUNT% https://someplace/ + +test: off diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/minisat/core/Solver.cc new/minisat-2.2.1+20180702/minisat/core/Solver.cc --- old/minisat-2.2.0+20130925/minisat/core/Solver.cc 2013-09-25 14:16:18.000000000 +0200 +++ new/minisat-2.2.1+20180702/minisat/core/Solver.cc 2018-07-02 03:46:34.000000000 +0200 @@ -992,11 +992,11 @@ { double cpu_time = cpuTime(); double mem_used = memUsedPeak(); - printf("restarts : %"PRIu64"\n", starts); - printf("conflicts : %-12"PRIu64" (%.0f /sec)\n", conflicts , conflicts /cpu_time); - printf("decisions : %-12"PRIu64" (%4.2f %% random) (%.0f /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions /cpu_time); - printf("propagations : %-12"PRIu64" (%.0f /sec)\n", propagations, propagations/cpu_time); - printf("conflict literals : %-12"PRIu64" (%4.2f %% deleted)\n", tot_literals, (max_literals - tot_literals)*100 / (double)max_literals); + printf("restarts : %lu\n", starts); + printf("conflicts : %-12lu (%.0f /sec)\n", conflicts , conflicts /cpu_time); + printf("decisions : %-12lu (%4.2f %% random) (%.0f /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions /cpu_time); + printf("propagations : %-12lu (%.0f /sec)\n", propagations, propagations/cpu_time); + printf("conflict literals : %-12lu (%4.2f %% deleted)\n", tot_literals, (max_literals - tot_literals)*100 / (double)max_literals); if (mem_used != 0) printf("Memory used : %.2f MB\n", mem_used); printf("CPU time : %g s\n", cpu_time); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/minisat/core/SolverTypes.h new/minisat-2.2.1+20180702/minisat/core/SolverTypes.h --- old/minisat-2.2.0+20130925/minisat/core/SolverTypes.h 2013-09-25 14:16:18.000000000 +0200 +++ new/minisat-2.2.1+20180702/minisat/core/SolverTypes.h 2018-07-02 03:46:34.000000000 +0200 @@ -52,7 +52,7 @@ int x; // Use this as a constructor: - friend Lit mkLit(Var var, bool sign = false); + friend Lit mkLit(Var var, bool sign); bool operator == (Lit p) const { return x == p.x; } bool operator != (Lit p) const { return x != p.x; } @@ -60,7 +60,7 @@ }; -inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } +inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } inline bool sign (Lit p) { return p.x & 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/minisat/utils/Options.h new/minisat-2.2.1+20180702/minisat/utils/Options.h --- old/minisat-2.2.0+20130925/minisat/utils/Options.h 2013-09-25 14:16:18.000000000 +0200 +++ new/minisat-2.2.1+20180702/minisat/utils/Options.h 2018-07-02 03:46:34.000000000 +0200 @@ -282,15 +282,15 @@ if (range.begin == INT64_MIN) fprintf(stderr, "imin"); else - fprintf(stderr, "%4"PRIi64, range.begin); + fprintf(stderr, "%4" PRIi64, range.begin); fprintf(stderr, " .. "); if (range.end == INT64_MAX) fprintf(stderr, "imax"); else - fprintf(stderr, "%4"PRIi64, range.end); + fprintf(stderr, "%4" PRIi64, range.end); - fprintf(stderr, "] (default: %"PRIi64")\n", value); + fprintf(stderr, "] (default: %" PRIi64 ")\n", value); if (verbose){ fprintf(stderr, "\n %s\n", description); fprintf(stderr, "\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minisat-2.2.0+20130925/minisat/utils/System.cc new/minisat-2.2.1+20180702/minisat/utils/System.cc --- old/minisat-2.2.0+20130925/minisat/utils/System.cc 2013-09-25 14:16:18.000000000 +0200 +++ new/minisat-2.2.1+20180702/minisat/utils/System.cc 2018-07-02 03:46:34.000000000 +0200 @@ -77,7 +77,7 @@ struct rusage ru; getrusage(RUSAGE_SELF, &ru); return (double)ru.ru_maxrss / 1024; } -double Minisat::memUsedPeak() { return memUsed(); } +double Minisat::memUsedPeak(bool strictlyPeak) { return memUsed(); } #elif defined(__APPLE__) @@ -87,11 +87,11 @@ malloc_statistics_t t; malloc_zone_statistics(NULL, &t); return (double)t.max_size_in_use / (1024*1024); } -double Minisat::memUsedPeak() { return memUsed(); } +double Minisat::memUsedPeak(bool strictlyPeak) { return memUsed(); } #else -double Minisat::memUsed() { return 0; } -double Minisat::memUsedPeak() { return 0; } +double Minisat::memUsed() { return 0; } +double Minisat::memUsedPeak(bool strictlyPeak) { return 0; } #endif
