Skip to content

Commit 5ea9c3f

Browse files
committed
Fix the packaging of the OR-Tools shared libraries
1 parent 9f74cf1 commit 5ea9c3f

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ build:linux:
2424
variables:
2525
GIT_SUBMODULE_STRATEGY: recursive
2626
GIT_STRATEGY: clone
27-
DISABLE_COPYRIGHT_FILES_DEPLOYMENT: '1'
28-
DEBUG: '1'
27+
DISABLE_COPYRIGHT_FILES_DEPLOYMENT: "1"
28+
DEBUG: "1"
2929
script:
3030
- mkdir -p build; cd build
3131
- qmake -makefile "CONFIG+=bundled" "CXX_PREFIX=ccache" "DEFINES+=MINIZINC_IDE_BUILD=\\\\\\\"\"${CI_PIPELINE_ID}\\\\\\\"\"" PREFIX=/usr ../MiniZincIDE/MiniZincIDE.pro
@@ -216,7 +216,7 @@ package:linux:
216216
- mv vendor/chuffed/bin/fzn-chuffed $PACKAGE/bin/
217217
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/share/minizinc/
218218
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/bin/
219-
- cp vendor/or-tools/lib64/*.so $PACKAGE/lib/
219+
- cp -P vendor/or-tools/lib64/*.so* $PACKAGE/lib/
220220
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/share/minizinc/
221221
- cp vendor/highs/lib64/libhighs.so $PACKAGE/lib/
222222
### Package Globalizer
@@ -389,7 +389,7 @@ package:appimage:
389389
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/usr/share/minizinc/
390390
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/usr/bin/
391391
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/usr/share/minizinc/
392-
- cp vendor/or-tools/lib64/*.so $PACKAGE/usr/lib/
392+
- cp -P vendor/or-tools/lib64/*.so* $PACKAGE/usr/lib/
393393
- cp vendor/highs/lib64/libhighs.so $PACKAGE/usr/lib/
394394
### Package Globalizer
395395
- mv globalizer/bin/minizinc-globalizer $PACKAGE/usr/bin/
@@ -483,7 +483,7 @@ minizinc:linux:nogui:
483483
- mv vendor/chuffed/bin/fzn-chuffed $PACKAGE/bin/
484484
- cp -r vendor/chuffed/share/minizinc/* $PACKAGE/share/minizinc/
485485
- mv vendor/or-tools/bin/fzn-cp-sat $PACKAGE/bin/
486-
- cp vendor/or-tools/lib64/*.so $PACKAGE/lib/
486+
- cp -P vendor/or-tools/lib64/*.so* $PACKAGE/lib/
487487
- cp -r vendor/or-tools/share/minizinc/* $PACKAGE/share/minizinc/
488488
- cp vendor/highs/lib64/libhighs.so $PACKAGE/lib/
489489
### Strip included binaries

resources/pkg_config/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ RUN [ -f "/etc/alpine-release" ] && apk add --no-cache binutils || (apt-get upda
1717
RUN cd /usr/local/bin && strip minizinc mzn2doc fzn-chuffed fzn-gecode /or-tools/bin/fzn-cp-sat
1818

1919
# Generate resulting Docker image
20-
FROM ${BASE}
20+
FROM ${BASE}
2121

2222
RUN [ ! -f "/etc/alpine-release" ] || apk add --no-cache libstdc++
2323

2424
COPY --from=composer /usr/local/bin/* /usr/local/bin/
2525
COPY --from=composer /usr/local/share/minizinc /usr/local/share/minizinc
2626
COPY --from=composer /usr/local/lib*/libhighs.so /usr/local/lib/
2727
COPY --from=composer /or-tools/bin/fzn-cp-sat /usr/local/bin/
28+
COPY --from=composer /or-tools/lib*/*.so* /usr/local/lib/
2829
COPY --from=composer /or-tools/share/minizinc /usr/local/share/minizinc

0 commit comments

Comments
 (0)