Skip to content

Commit

Permalink
libminizinc-2.8.7 (untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Jan 6, 2025
1 parent aa4f620 commit 3402272
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 32 deletions.
43 changes: 24 additions & 19 deletions libminizinc/README
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,44 @@ the higher-level language Zinc. We hope it will be adopted as a standard by the
Constraint Programming community.

Runtime requirements:
cygwin-3.5.0-1
libgcc1-11.4.0-1
libmzn-devel-2.8.3-1bl1
libmzn2-2.8.3-1bl1
libstdc++6-11.4.0-1
pkg-config-2.1.1-1
cygwin-3.5.4-1
libgcc1-12.4.0-3
libmzn-devel-2.8.7-1bl1
libmzn2-2.8.7-1bl1
libstdc++6-12.4.0-3
pkg-config-2.3.0-1

Build requirements:
(besides corresponding -devel packages)
binutils-2.42-1
binutils-2.43.1-1
bison-3.8.2-1
cmake-3.25.3-1
cygport-0.36.8-1
cmake-3.28.3-1
cygport-0.36.9-1
flex-2.6.4-2
gcc-core-11.4.0-1
gcc-g++-11.4.0-1
ninja-1.11.1-1
gcc-core-12.4.0-3
gcc-g++-12.4.0-3
ninja-1.12.0-1

Canonical website:
https://www.minizinc.org/

Canonical download:
https://github.com/MiniZinc/libminizinc/archive/refs/tags/2.8.3.tar.gz
https://github.com/MiniZinc/libminizinc/archive/refs/tags/2.8.7.tar.gz

-------------------------------------------

Build instructions:
1. unpack libminizinc-2.8.3-X-src.tar.xz
1. unpack libminizinc-2.8.7-X-src.tar.xz
2. if you use setup to install this src package,
it will be unpacked under /usr/src automatically
% cd /usr/src
% cygport ./libminizinc-2.8.3-X.cygport all
% cygport ./libminizinc-2.8.7-X.cygport all

This will create:
/usr/src/libminizinc-2.8.3-X-src.tar.xz
/usr/src/libminizinc-2.8.3-X.tar.xz
/usr/src/libmzn2-2.8.3-X.tar.xz
/usr/src/libmzn-devel-2.8.3-X.tar.xz
/usr/src/libminizinc-2.8.7-X-src.tar.xz
/usr/src/libminizinc-2.8.7-X.tar.xz
/usr/src/libmzn2-2.8.7-X.tar.xz
/usr/src/libmzn-devel-2.8.7-X.tar.xz

-------------------------------------------

Expand Down Expand Up @@ -890,6 +890,8 @@ Files included in the binary package:
/usr/include/minizinc/solvers/MIP/MIP_wrap.hh
/usr/include/minizinc/solvers/MIP/MIP_xpress_solverfactory.hh
/usr/include/minizinc/solvers/MIP/MIP_xpress_wrap.hh
/usr/include/minizinc/solvers/atlantis_solverfactory.hh
/usr/include/minizinc/solvers/atlantis_solverinstance.hh
/usr/include/minizinc/solvers/chuffed_solverfactory.hh
/usr/include/minizinc/solvers/chuffed_solverinstance.hh
/usr/include/minizinc/solvers/fzn_solverfactory.hh
Expand Down Expand Up @@ -930,6 +932,9 @@ Files included in the binary package:

Port Notes:

----- version 2.8.7-1bl1 -----
Version bump.

----- version 2.8.3-1bl1 -----
Version bump.

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- origsrc/libminizinc-2.8.3/CMakeLists.txt 2024-02-01 13:19:08.000000000 +0900
+++ src/libminizinc-2.8.3/CMakeLists.txt 2024-02-15 08:14:02.215637700 +0900
@@ -102,3 +102,10 @@ include(cmake/support/config_output.cmak
--- origsrc/libminizinc-2.8.7/CMakeLists.txt 2024-10-02 14:33:56.000000000 +0900
+++ src/libminizinc-2.8.7/CMakeLists.txt 2025-01-06 20:36:46.873675900 +0900
@@ -103,3 +103,10 @@ include(cmake/support/config_output.cmak
# -------------------------------------------------------------------------------------------------------------------
# -- Support Actions
include(cmake/support/format.cmake)
Expand All @@ -11,8 +11,8 @@
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+configure_file(${CMAKE_SOURCE_DIR}/libminizinc.pc.in ${CMAKE_BINARY_DIR}/libminizinc.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/libminizinc.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
--- origsrc/libminizinc-2.8.3/cmake/support/compiler_setup.cmake 2024-02-01 13:19:08.000000000 +0900
+++ src/libminizinc-2.8.3/cmake/support/compiler_setup.cmake 2024-02-15 08:14:02.215637700 +0900
--- origsrc/libminizinc-2.8.7/cmake/support/compiler_setup.cmake 2024-10-02 14:33:56.000000000 +0900
+++ src/libminizinc-2.8.7/cmake/support/compiler_setup.cmake 2025-01-06 20:36:46.889289100 +0900
@@ -44,20 +44,22 @@ int main (int argc, char* argv[])
}
" HAS_PIDPATH)
Expand Down Expand Up @@ -49,8 +49,8 @@

check_cxx_source_compiles("
#include <string.h>
--- origsrc/libminizinc-2.8.3/cmake/targets/libmzn.cmake 2024-02-01 13:19:08.000000000 +0900
+++ src/libminizinc-2.8.3/cmake/targets/libmzn.cmake 2024-02-15 08:14:02.231265300 +0900
--- origsrc/libminizinc-2.8.7/cmake/targets/libmzn.cmake 2024-10-02 14:33:56.000000000 +0900
+++ src/libminizinc-2.8.7/cmake/targets/libmzn.cmake 2025-01-06 20:36:46.889289100 +0900
@@ -129,6 +129,10 @@ add_library(mzn
)
target_link_libraries(mzn ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
Expand All @@ -60,11 +60,11 @@
+endif()
+
### Add Solver Interfaces to the MiniZinc library when available
include(cmake/targets/libminizinc_atlantis.cmake)
include(cmake/targets/libminizinc_chuffed.cmake)
include(cmake/targets/libminizinc_cplex.cmake)
--- origsrc/libminizinc-2.8.3/lib/model.cpp 2024-02-01 13:19:08.000000000 +0900
+++ src/libminizinc-2.8.3/lib/model.cpp 2024-02-15 08:14:02.231265300 +0900
@@ -203,7 +203,7 @@ bool can_increment_type(const Type& t, P
--- origsrc/libminizinc-2.8.7/lib/model.cpp 2024-10-02 14:33:56.000000000 +0900
+++ src/libminizinc-2.8.7/lib/model.cpp 2025-01-06 20:36:46.889289100 +0900
@@ -205,7 +205,7 @@ bool can_increment_type(const Type& t, P
return t.st() == Type::ST_PLAIN || t.bt() != Type::BT_INT;
case PBT_BIF:
return t.bt() != Type::BT_FLOAT;
Expand All @@ -73,8 +73,8 @@
return false;
}
throw InternalError("Invalid BaseType");
--- origsrc/libminizinc-2.8.3/libminizinc.pc.in 1970-01-01 09:00:00.000000000 +0900
+++ src/libminizinc-2.8.3/libminizinc.pc.in 2024-02-15 08:14:02.231265300 +0900
--- origsrc/libminizinc-2.8.7/libminizinc.pc.in 1970-01-01 09:00:00.000000000 +0900
+++ src/libminizinc-2.8.7/libminizinc.pc.in 2025-01-06 20:36:46.889289100 +0900
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
Expand Down

0 comments on commit 3402272

Please sign in to comment.