V1.0.3 10.1 #3
V1.0.3 10.1 #3
Conversation
|
@abmusse , can you please look these over? |
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -malign-power -malign-natural") | ||
| set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -malign-power -malign-natural") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMARIA_PLUGIN_INTERFACE_VERSION=536875296 -malign-power -malign-natural -DDBUG_OFF -mlong-double-128") | ||
| set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DMARIA_PLUGIN_INTERFACE_VERSION=536875296 -malign-power -malign-natural -DDBUG_OFF -mlong-double-128") |
There was a problem hiding this comment.
@davidl71, what's the magic you used to determine -DMARIA_PLUGIN_INTERFACE_VERSION=536875296?
I believe the other changes to this line are no longer needed due to other source code changes in the master branch
| Fixup for gcc 6.3 from IBM yum repo | ||
| cd storage/ibmdb2i/special | ||
| cp /usr/include/unistd.h | ||
| cp /QIBM/include/qmyse.h |
There was a problem hiding this comment.
@abmusse , do you know why these steps aren't required for your builds you've done?
There was a problem hiding this comment.
Looks there is qmyse.h in special/include already
https://github.com/zendtech/db2iengine/blob/master/special/include/qmyse.h
We prepend the special/include to our include directories here:
https://github.com/zendtech/db2iengine/blob/master/CMakeLists.txt#L3
https://cmake.org/cmake/help/v3.7/command/include_directories.html#command:include_directories
I'm not sure why /usr/include/unistd.h is needed though. @davidl-zend Can you chime in on this?
| @@ -3859,10 +3842,10 @@ maria_declare_plugin(ibmdb2i) | |||
| PLUGIN_LICENSE_GPL, | |||
| ibmdb2i_init_func, | |||
| ibmdb2i_done_func, | |||
| 0x0100, | |||
| 0x0102, | |||
There was a problem hiding this comment.
@davidl71, please explain this change. We might need this!
| @@ -61,6 +61,24 @@ OF SUCH DAMAGE. | |||
| #include "db2i_errors.h" | |||
| #include "db2i_sqlStatementStream.h" | |||
|
|
|||
| //David Lowes - Temporarily exclude mysql/plugin.h and manually define used constants | |||
There was a problem hiding this comment.
Any idea why you needed to do this?
IBM has been building against 10.3, so curious if something changed between mariadb versions
Allow db2iengine to compile on IBMiV7R2 using gcc 6.3 from IBM yum repository against mariadb 10.1. This pull request should be used for reference and preferably not merged into master but onto a separate branch.