Bug 269654 - databases/mariadb106-server: fix typo in mysql_config patch
Summary: databases/mariadb106-server: fix typo in mysql_config patch
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bernard Spil
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-02-18 14:52 UTC by Oleg Sidorkin
Modified: 2023-04-10 11:45 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (brnrd)

Attachments
patch to fix typo in the mysql_config patch (apply via git am) (1019 bytes, patch)
2023-02-18 14:52 UTC, Oleg Sidorkin 		brnrd: maintainer-approval+
Details | Diff
another patch to fix typo in the mysql_config patch (apply via git am) (1016 bytes, patch)
2023-02-22 14:50 UTC, Oleg Sidorkin 		osidorkin: maintainer-approval?
Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Oleg Sidorkin 2023-02-18 14:52:29 UTC 
Created attachment 240237 [details]
patch to fix typo in the mysql_config patch (apply via git am)

This patch fixes mysql_config --libmysqld-libs output (and amarok build with mariadb106).

Without patch: -L/usr/local/lib/mysql  -lmysqld -/usr/local/lib
With patch: -L/usr/local/lib/mysql  -lmysqld -L/usr/local/lib
Comment 1 Bernard Spil freebsd_committer freebsd_triage 2023-02-19 19:21:35 UTC 
Comment on attachment 240237 [details]
patch to fix typo in the mysql_config patch (apply via git am)

Will land shortly with 10.6.12
Comment 2 commit-hook freebsd_committer freebsd_triage 2023-02-19 19:47:24 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7817c5e1b92ed3ad496e2397dda57810f4ab6ac1

commit 7817c5e1b92ed3ad496e2397dda57810f4ab6ac1
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-02-19 19:40:19 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-02-19 19:46:34 +0000

    databases/mariadb106-server: Update to 10.6.12

     * 267386 Fixes broken symlink
     * 269654 Fixes issue in mysql_config patch

    PR:             269457, 267386 [1], 269654 [2]
    Reported by:    Ivan Rozhuk <rozhuk im gmail com> [1], Oleg Sidorkin <osidorkin gmail com> [2]

 databases/mariadb106-server/Makefile                             | 3 ++-
 databases/mariadb106-server/distinfo                             | 6 +++---
 databases/mariadb106-server/files/patch-scripts_mysql__config.sh | 2 +-
 databases/mariadb106-server/pkg-plist                            | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
Comment 3 Oleg Sidorkin 2023-02-19 21:32:01 UTC 
(In reply to Bernard Spil from comment #1)

Something went wrong with the patch: -L was prepended to the wrong entry

# mysql_config  --libmysqld-libs
-L-L/usr/local/lib/mysql  -lmysqld -/usr/local/lib

Could you check it again please?
Comment 4 Oleg Sidorkin 2023-02-20 16:11:06 UTC 
The patch was mismerged,  mysql_config --libmysqld-libs output is still broken
Comment 5 Oleg Sidorkin 2023-02-22 14:50:28 UTC 
Created attachment 240329 [details]
another patch to fix typo in the mysql_config patch (apply via git am)

Updated patch against current ports
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-04-10 11:43:31 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54e3c4d650d40e5883cd781d7100898b291bec30

commit 54e3c4d650d40e5883cd781d7100898b291bec30
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-04-10 11:41:46 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-04-10 11:41:46 +0000

    databases/mariadb1011-server: Fix typo in mysql_config

    PR:             269654
    Reported by:    Oleg Sidorkin <osidorkin gmail com>

 databases/mariadb1011-server/Makefile                             | 2 +-
 databases/mariadb1011-server/files/patch-scripts_mysql__config.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)