MDEV-19206: cmake: support new libedit interface #1001
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi all, This pull request is under new BSD license. Kind regards, |
micmac1
added a commit
to micmac1/packages
that referenced
this pull request
Dec 15, 2018
libedit changed its interface a while back. mariadb currently does not recognize this interface and instead uses a static old readline version. It does not link in the system readline due to licence incompatibility. This commit adds a patch that enables mariadb to detect and use the system libedit. The patch was sent upstream already ([1]). [1] MariaDB/server#1001 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
thiagoricciardi
pushed a commit
to thiagoricciardi/packages
that referenced
this pull request
Apr 3, 2019
libedit changed its interface a while back. mariadb currently does not recognize this interface and instead uses a static old readline version. It does not link in the system readline due to licence incompatibility. This commit adds a patch that enables mariadb to detect and use the system libedit. The patch was sent upstream already ([1]). [1] MariaDB/server#1001 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
an3l
changed the title
grooverdan
reviewed
Apr 8, 2019
|
Whoa, blast from the past ;-)
Give me some time and I'll check it out.
Regards,
Seb
|
libedit changed it's interface a while ago. MariaDB's cmake file doesn't
recognize the new interface, the compile test fails:
/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)':
/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive]
int res= (*rl_completion_entry_function)(0,0);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
Fix this by adding a detection for the new interface as well.
Run-tested on a MIPS machine.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
micmac1
force-pushed
the
support_new_libedit
branch
from
2220f74
to
d9342e8
Compare
|
Morning, actually that line sets the variable which announces the char interface. It _is_ used alright ;-)
|
vaintroub
approved these changes
Sep 20, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
libedit changed it's interface a while ago. MariaDB's cmake file doesn't
recognize the new interface, the compile test fails:
/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)':
/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive]
int res= (*rl_completion_entry_function)(0,0);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
Fix this by adding a detection for the new interface as well.
In client/mysql.cc the ifdefs for the new readline interface are
extended to also check for the new libedit interface. They work the same
way.
Run-tested on a MIPS machine.
Signed-off-by: Sebastian Kemper sebastian_ml@gmx.net