diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2023-02-06 17:47:48 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2023-02-06 17:51:15 +0000 |
| commit | 6498bc6381cc493b38ff7d1ab6087a66f0ec238f (patch) | |
| tree | feddd09683da1a9209e1e4ab59215a791f12a46e | |
| parent | 09d31e6b7b78c678eb966a94c4a6f18e96f509a7 (diff) | |
| download | ports-6498bc6381cc493b38ff7d1ab6087a66f0ec238f.tar.gz ports-6498bc6381cc493b38ff7d1ab6087a66f0ec238f.zip | |
databases/mysql80-*: Unbreak on i386
Fix a issue with i386:
--yplg_out: protoc-gen-yplg: Plugin killed by signal 11.
*** Error code 1
PR: 269203
Sponsored by: Netzkommmune GmbH
| -rw-r--r-- | databases/mysql80-client/pkg-plist | 2 | ||||
| -rw-r--r-- | databases/mysql80-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql80-server/pkg-plist | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist index 217691d18f1e..b185afa48caf 100644 --- a/databases/mysql80-client/pkg-plist +++ b/databases/mysql80-client/pkg-plist @@ -33,6 +33,8 @@ lib/mysql/libmysqlclient.so.21 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.21 +@comment lib/private/libprotobuf-lite.so.3.19.4 +@comment lib/private/libprotobuf.so.3.19.4 %%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so lib/mysql/plugin/authentication_fido_client.so lib/mysql/plugin/authentication_oci_client.so diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 7c2defec14e6..d017bb3b7d98 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -12,8 +12,6 @@ WWW= https://www.mysql.com/ LICENSE= GPLv2 -BROKEN_i386= --yplg_out: protoc-gen-yplg: Plugin killed by signal 11. - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client @@ -86,7 +84,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_ICU=system \ -DWITH_CURL=system \ -DWITH_ZSTD=system \ - -DWITH_PROTOBUF=system \ + -DWITH_PROTOBUF=bundled \ -DWITH_SSL=system \ -DWITH_AUTHENTICATION_FIDO=1 \ -DBUILD_BUNDLED_ZLIB=0 \ diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist index 38337df0676b..7ad6d6236cac 100644 --- a/databases/mysql80-server/pkg-plist +++ b/databases/mysql80-server/pkg-plist @@ -173,6 +173,8 @@ lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so +@comment lib/private/libprotobuf-lite.so.3.19.4 +@comment lib/private/libprotobuf.so.3.19.4 libexec/mysqld share/man/man1/ibd2sdi.1.gz share/man/man1/innochecksum.1.gz @@ -192,6 +194,7 @@ share/man/man1/mysqldumpslow.1.gz share/man/man1/mysqlrouter_passwd.1.gz share/man/man1/mysqlrouter_plugin_info.1.gz share/man/man1/mysqlrouter.1.gz +lib/mysql/libprotobuf-lite.so.3.19.4 share/man/man8/mysqld.8.gz %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml |