Skip to content

Commit 0f43e99

Browse files
committed
Fixing RPM/DEB packaging
Adding configuration to include the polyglot library on the packages. Additionally, for RPM packages added an exclusion so the library is not registered as a package requirement. Change-Id: Ib0593bb602754fe7e7d5e5f62aad1c559be41dd3
1 parent c30e042 commit 0f43e99

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

mysqlshdk/scripting/polyglot/languages/polyglot_garbage_collector.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <memory>
3333
#include <mutex>
3434
#include <optional>
35+
#include <string>
3536
#include <thread>
3637

3738
namespace shcore {

packaging/debian/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,10 @@ file(APPEND "${DEST_DIR}/mysql-shell${PRODUCT_SUFFIX}.install"
308308
usr/lib/mysqlsh/libantlr4-runtime*.so*
309309
")
310310
endif()
311+
312+
if(BUNDLED_POLYGLOT_DIR)
313+
file(APPEND "${DEST_DIR}/mysql-shell${PRODUCT_SUFFIX}.install"
314+
"
315+
usr/lib/mysqlsh/libpolyglot.so
316+
")
317+
endif()

packaging/rpm/mysql-shell.spec.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Obsoletes: mysql-shell < %{version}-%{release}
150150
%global _pluginlibs %{nil}
151151
%endif
152152

153-
%global __requires_exclude ^(%{_openssllibs}|%{_pythonlibs}|%{_sshlibs}|%{_antlrlibs}|%{_pluginlibs})$
153+
%global __requires_exclude ^(%{_openssllibs}|%{_pythonlibs}|%{_sshlibs}|%{_antlrlibs}|%{_pluginlibs}|libpolyglot.*)$
154154

155155
%if 0%{?rhel} && 0%{?rhel} < 7
156156
%filter_setup
@@ -228,6 +228,9 @@ cmake .. \
228228
%endif
229229
%if 0%{?bundled_antlr:1}
230230
-DBUNDLED_ANTLR_DIR="%{bundled_antlr}" \
231+
%endif
232+
%if 0%{?bundled_polyglot:1}
233+
-DBUNDLED_POLYGLOT_DIR="%{bundled_polyglot}" \
231234
%endif
232235
-DHAVE_PYTHON=1 \
233236
-DLIBEXECDIR=`basename %{_libexecdir}`

0 commit comments

Comments
 (0)