From nobody Mon Feb 6 17:51:21 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9Yj55Nmnz3mysB; Mon, 6 Feb 2023 17:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9Yj54yvBz4Vpc; Mon, 6 Feb 2023 17:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675705881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6NGQ3MJNYdpIllmq1KSOpXmHvXaMgbnHPlTjr0fjQI=; b=ZOnOAo53cNk3ADV2c85pWevI1LSE8RdTWje8xNFwmiBdJaWFp9fwzV6VM7zg5g/juj4P8L ZeHopxiovS5JyO7hUeUucxD3yjwIm58MhbHvVl1KNdmCGW7oTISYLSi9jwyYlJ+Q1/3BH6 P5/nAbVLDINEfNMhmProK8FtEu/fXFE5FL4hNX1i4cc4cB3fSsUoW3aSr18+aiI/YC/DhP N+qlS9MJKvdv2/ekKVqf6qGtXeV7WiLX1ljVFGlr0g+ZUOH6SaEjjl/vB95X+isi7u0/CX 7/M7DiEbW43t/unj3xdwoHLWz1svdVPVDsxi31EXRNZ4p6rgpdapa3132KAauQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675705881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6NGQ3MJNYdpIllmq1KSOpXmHvXaMgbnHPlTjr0fjQI=; b=JV/osHA0MnwA5RE2TBvdDZcRKWdqAeNf7LRdj2Pj9vuWTzbXFQSSmXa54X8MmbGhNL6B3K +MDscG0JVTd/KfXBK2PIc9HPaHngMcmrKhclkJqSUogiFL+fojGONl+iwx2L7NgxCfXwG0 RYtzA6vgw+J92MPE9aq7I8o3uWOg0EpkmX+3Abe5Rku49aHn3o8Oj+GPgujtJikfctpu7g HjFk4msKrhRwjb1w6wVtx87JQNmtd6WIluPyEZPFCkxA4isYamLAafJ7eJs4Ar8xZ6l/Eh j+AKbLXX96OrV54dvP+Bi8GWb8fo1lNlHVTRaFHjY3HsVqvKD/eC/zL+x1YUvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675705881; a=rsa-sha256; cv=none; b=AUpmCyCHqTeH2qy5m0OayFGJlrSj5TNQVXkVsaZt+27WRHzk2y6rIqUx65YpmeEDh3FVyI 4UpwK9jC3NbESuz1tabGmM86D2rpvKDEygAkwt34845YQjNYHSp/K+vZlw5wrsKw4fexn/ +tdaukB+yrGY+l7kyErJo3oYrCfCEVhOOc+vHrhEskSE1qSSEk4grsdFW6R1YSPUJ45p7k DofNFMtac86TcHZYic1r6zJTIVBC4bCJBPO3Sjg8JlbjndYKkcr3yk7tyPgdVqCQ/8JvJ3 sVKyUXNEFBuVthS4qC26KVtnzM1zdqvkZEtzeeuEcfCnV5ufPFDhSzbgV/z17Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9Yj544h1zkjD; Mon, 6 Feb 2023 17:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316HpLmD070822; Mon, 6 Feb 2023 17:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316HpLWA070821; Mon, 6 Feb 2023 17:51:21 GMT (envelope-from git) Date: Mon, 6 Feb 2023 17:51:21 GMT Message-Id: <202302061751.316HpLWA070821@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 6498bc6381cc - main - databases/mysql80-*: Unbreak on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6498bc6381cc493b38ff7d1ab6087a66f0ec238f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=6498bc6381cc493b38ff7d1ab6087a66f0ec238f commit 6498bc6381cc493b38ff7d1ab6087a66f0ec238f Author: Jochen Neumeister AuthorDate: 2023-02-06 17:47:48 +0000 Commit: Jochen Neumeister CommitDate: 2023-02-06 17:51:15 +0000 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 --- databases/mysql80-client/pkg-plist | 2 ++ databases/mysql80-server/Makefile | 4 +--- 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