Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDEV-33091 rename PCRE_INCLUDES to use PKG_CHECK_MODULES naming, PCRE_INCLUDE_DIR #3304

Open
wants to merge 2 commits into
base: develop-6
Choose a base branch
from

Conversation

grooverdan
Copy link
Contributor

The 10.6 server changed the name of the include.

ref: MariaDB/server@3a33ae8

Noticed thanks to @LinuxJedi

I also backported the same commit to 10.5 - MariaDB/server#3484 however since its less maintained, appended a workaround mapping for columnstore there.

…_INCLUDE_DIR

The 10.6 server changed the name of the include in commit 3a33ae86010051a1022c392f2936b5fc9f3ab19e.

Noticed thanks to Andrew Hutchings
grooverdan added a commit to grooverdan/mariadb-server that referenced this pull request Sep 5, 2024
From e735cf2, the PCRE_INCLUDES
changed to PCRE_INCLUDE_DIRS for consistency.

The columnstore module depends on the old name.

Create a mapping for the columnstore submodule.

10.6+ fix for submodule is:
* mariadb-corporation/mariadb-columnstore-engine#3304
grooverdan added a commit to grooverdan/mariadb-server that referenced this pull request Sep 5, 2024
From e735cf2, the PCRE_INCLUDES
changed to PCRE_INCLUDE_DIRS for consistency.

The columnstore module depends on the old name.

Create a mapping for the columnstore submodule.

10.6+ fix for submodule is:
* mariadb-corporation/mariadb-columnstore-engine#3304
grooverdan added a commit to MariaDB/server that referenced this pull request Sep 5, 2024
From e735cf2, the PCRE_INCLUDES
changed to PCRE_INCLUDE_DIRS for consistency.

The columnstore module depends on the old name.

Create a mapping for the columnstore submodule.

10.6+ fix for submodule is:
* mariadb-corporation/mariadb-columnstore-engine#3304
@drrtuy
Copy link
Collaborator

drrtuy commented Sep 13, 2024

@grooverdan Thx for the patch.
This change is actual for all versions of servers, I suppose?

@grooverdan
Copy link
Contributor Author

yes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants