[Maria-discuss] Fwd: [MariaDB Announce] MariaDB 10.2.9, MariaDB 10.1.28 and MariaDB Connector/J releases
it would be really cool if MariaDB minor updates (10.2.8 to 10.2.9 in
that case) would work like for any other software - just replace the
tarball, raise the version in the spec-file and hit "rpmbuild -bb
mariadb.spec"
CMakeError.log as tar.bz2 attached....
________________________________________________________________________________________
CMake Error at sql/CMakeLists.txt:387 (TARGET_LINK_LIBRARIES):
Target "mysqld" of type EXECUTABLE may not be linked into another target.
One may link only to STATIC or SHARED libraries, or to executables
with the
ENABLE_EXPORTS property set.
CMake Deprecation Warning at cmake/for_clients.cmake:15 (CMAKE_POLICY):
The OLD behavior for policy CMP0007 will be removed from a future version
of CMake.
The cmake-policies(7) manual explains that the OLD behaviors of all
policies are deprecated and that a policy should be set to OLD only under
specific short-term circumstances. Projects should be ported to the NEW
behavior and not rely on setting a policy to OLD.
Call Stack (most recent call first):
CMakeLists.txt:415 (INCLUDE)
________________________________________________________________________________________
cmake . \
-DFEATURE_SET="large" \
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-DINSTALL_INCLUDEDIR=include/mysql \
-DINSTALL_LAYOUT=RPM \
-DDAEMON_NAME="mysqld" \
-DDAEMON_NO_PREFIX="mysqld" \
-DNICE_PROJECT_NAME="MariaDB" \
-DINSTALL_LIBDIR="%{_lib}/mysql" \
-DINSTALL_MANDIR=share/man \
-DINSTALL_MYSQLSHAREDIR=share/mysql \
-DINSTALL_MYSQLTESTDIR=share/mysql-test \
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
-DINSTALL_SBINDIR=libexec \
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_SQLBENCHDIR= \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DMYSQL_DATADIR="%{_sharedstatedir}/mysql" \
-DMYSQL_UNIX_ADDR="%{_sharedstatedir}/mysql/mysql.sock" \
-DENABLED_PROFILING=OFF \
-DENABLE_DEBUG_SYNC=OFF \
-DENABLE_DTRACE=OFF \
-DPLUGIN_ARIA=YES \
-DPLUGIN_CSV=YES \
-DPLUGIN_MYISAM=YES \
-DPLUGIN_ARCHIVE=NO \
-DPLUGIN_BLACKHOLE=NO \
-DPLUGIN_CASSANDRA=NO \
-DPLUGIN_CONNECT=NO \
-DPLUGIN_EXAMPLE=NO \
-DPLUGIN_FEDERATED=NO \
-DPLUGIN_FEDERATEDX=NO \
-DPLUGIN_FEEDBACK=NO \
-DPLUGIN_MROONGA=NO \
-DPLUGIN_MYISAMMRG=NO \
-DPLUGIN_OQGRAPH=NO \
-DPLUGIN_PARTITION=NO \
-DPLUGIN_PERFSCHEMA=NO \
-DPLUGIN_ROCKSDB=NO \
-DPLUGIN_SEMISYNC=NO \
-DPLUGIN_SEQUENCE=NO \
-DPLUGIN_SPHINX=NO \
-DPLUGIN_SPIDER=NO \
-DPLUGIN_TOKUDB=NO \
-DPLUGIN_XTRADB=NO \
-DWITHOUT_DYNAMIC_PLUGINS=ON \
-DWITH_ATOMIC_OPS=smp \
-DWITH_EMBEDDED_SERVER=OFF \
-DWITH_INNODB_DISALLOW_WRITES=OFF \
-DWITH_INNODB_BZIP2=OFF \
-DWITH_INNODB_LZ4=OFF \
-DWITH_INNODB_LZMA=OFF \
-DWITH_INNODB_LZO=OFF \
-DWITH_INNODB_SNAPPY=OFF \
-DWITH_MYSQLCOMPAT=ON \
-DSECURITY_HARDENED=OFF \
-DWITH_LIBARCHIVE=OFF \
-DWITH_LIBWRAP=OFF \
-DWITH_MARIABACKUP=OFF \
-DWITH_PIC=NO \
-DWITH_READLINE=OFF \
-DWITH_SAFEMALLOC=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_WSREP=OFF \
-DWITH_JEMALLOC=OFF \
-DWITH_SSL=system \
-DWITH_ZLIB=system \
-DCOMPILATION_COMMENT="thelounge"
%{__make} %{?_smp_mflags}
________________________________________________________________________________________
-------- Weitergeleitete Nachricht --------
Betreff: [MariaDB Announce] MariaDB 10.2.9, MariaDB 10.1.28 and MariaDB
Connector/J releases
Datum: Thu, 28 Sep 2017 11:57:47 +0200
Von: MariaDB Announce List
Hi, Reindl! On Sep 28, Reindl Harald wrote:
it would be really cool if MariaDB minor updates (10.2.8 to 10.2.9 in that case) would work like for any other software - just replace the tarball, raise the version in the spec-file and hit "rpmbuild -bb mariadb.spec"
CMakeError.log as tar.bz2 attached.... ________________________________________________________________________________________
CMake Error at sql/CMakeLists.txt:387 (TARGET_LINK_LIBRARIES): Target "mysqld" of type EXECUTABLE may not be linked into another target. One may link only to STATIC or SHARED libraries, or to executables with the ENABLE_EXPORTS property set.
CMake Deprecation Warning at cmake/for_clients.cmake:15 (CMAKE_POLICY): The OLD behavior for policy CMP0007 will be removed from a future version of CMake.
The cmake-policies(7) manual explains that the OLD behaviors of all policies are deprecated and that a policy should be set to OLD only under specific short-term circumstances. Projects should be ported to the NEW behavior and not rely on setting a policy to OLD. Call Stack (most recent call first): CMakeLists.txt:415 (INCLUDE)
Could it be caused by, say, you upgrading cmake to some newest bleeding-edge version? Or some other changes you did meanwhile? cmake/for_clients.cmake hasn't changed between 10.2.8 and 10.2.9. sql/CMakeLists.txt did, but nowhere near the line 387: 376 IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED) 377 ADD_LIBRARY(udf_example MODULE udf_example.c) 378 SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "") 379 # udf_example depends on strings 380 IF(WIN32) 381 IF(MSVC) 382 SET_TARGET_PROPERTIES(udf_example PROPERTIES LINK_FLAGS "/DEF:${CMA 383 ENDIF() 384 TARGET_LINK_LIBRARIES(udf_example strings) 385 ELSE() 386 # udf_example is using safemutex exported by mysqld 387 TARGET_LINK_LIBRARIES(udf_example mysqld) 388 ENDIF() 389 ENDIF() all that code is from 2009. Regards, Sergei Chief Architect MariaDB and security@mariadb.org
Am 28.09.2017 um 18:17 schrieb Sergei Golubchik:
Hi, Reindl!
On Sep 28, Reindl Harald wrote:
it would be really cool if MariaDB minor updates (10.2.8 to 10.2.9 in that case) would work like for any other software - just replace the tarball, raise the version in the spec-file and hit "rpmbuild -bb mariadb.spec"
Could it be caused by, say, you upgrading cmake to some newest bleeding-edge version? Or some other changes you did meanwhile?
no, when i just change the "Version" tag in the previously attached mariadb.spec back to 10.2.8 nd hit cursor-up + enter i get a fresh 10.2.8 build the "CMake Deprecation Warning" warnings i dont care about are also there for 10.2.8, yes after a cmake update, but don#t matter at topic i care about the attachments which clearly shows that build fails hard
cmake/for_clients.cmake hasn't changed between 10.2.8 and 10.2.9. sql/CMakeLists.txt did, but nowhere near the line 387:
but something is broken now even on Fedora 25, i stopped trying on the F26 machine after that
376 IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED) 377 ADD_LIBRARY(udf_example MODULE udf_example.c) 378 SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "") 379 # udf_example depends on strings 380 IF(WIN32) 381 IF(MSVC) 382 SET_TARGET_PROPERTIES(udf_example PROPERTIES LINK_FLAGS "/DEF:${CMA 383 ENDIF() 384 TARGET_LINK_LIBRARIES(udf_example strings) 385 ELSE() 386 # udf_example is using safemutex exported by mysqld 387 TARGET_LINK_LIBRARIES(udf_example mysqld) 388 ENDIF() 389 ENDIF()
all that code is from 2009
something got broken and it no longer builds, please look at the attachments from my initial mail
Hi, Reindl! I was able to repeat this error using your cmake command-line. The culprit here is -DWITHOUT_DYNAMIC_PLUGINS=ON. The commit that introduced the bug (43b262af55db507320b165bb0f9abf05b2f05a89) makes SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) to be only done when dynamic plugins are enabled. But udf_example.so is built even without dynamic plugins. Incidentally, this is already fixed in the latest 10.2 code - your exact cmake command-line completes successfully. Sorry :( On Sep 28, Reindl Harald wrote:
it would be really cool if MariaDB minor updates (10.2.8 to 10.2.9 in that case) would work like for any other software - just replace the tarball, raise the version in the spec-file and hit "rpmbuild -bb mariadb.spec" ... cmake . \ -DFEATURE_SET="large" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_LAYOUT=RPM \ -DDAEMON_NAME="mysqld" \ -DDAEMON_NO_PREFIX="mysqld" \ -DNICE_PROJECT_NAME="MariaDB" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ -DINSTALL_MANDIR=share/man \ -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_MYSQLTESTDIR=share/mysql-test \ -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ -DINSTALL_SBINDIR=libexec \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR=share/mysql \ -DMYSQL_DATADIR="%{_sharedstatedir}/mysql" \ -DMYSQL_UNIX_ADDR="%{_sharedstatedir}/mysql/mysql.sock" \ -DENABLED_PROFILING=OFF \ -DENABLE_DEBUG_SYNC=OFF \ -DENABLE_DTRACE=OFF \ -DPLUGIN_ARIA=YES \ -DPLUGIN_CSV=YES \ -DPLUGIN_MYISAM=YES \ -DPLUGIN_ARCHIVE=NO \ -DPLUGIN_BLACKHOLE=NO \ -DPLUGIN_CASSANDRA=NO \ -DPLUGIN_CONNECT=NO \ -DPLUGIN_EXAMPLE=NO \ -DPLUGIN_FEDERATED=NO \ -DPLUGIN_FEDERATEDX=NO \ -DPLUGIN_FEEDBACK=NO \ -DPLUGIN_MROONGA=NO \ -DPLUGIN_MYISAMMRG=NO \ -DPLUGIN_OQGRAPH=NO \ -DPLUGIN_PARTITION=NO \ -DPLUGIN_PERFSCHEMA=NO \ -DPLUGIN_ROCKSDB=NO \ -DPLUGIN_SEMISYNC=NO \ -DPLUGIN_SEQUENCE=NO \ -DPLUGIN_SPHINX=NO \ -DPLUGIN_SPIDER=NO \ -DPLUGIN_TOKUDB=NO \ -DPLUGIN_XTRADB=NO \ -DWITHOUT_DYNAMIC_PLUGINS=ON \ -DWITH_ATOMIC_OPS=smp \ -DWITH_EMBEDDED_SERVER=OFF \ -DWITH_INNODB_DISALLOW_WRITES=OFF \ -DWITH_INNODB_BZIP2=OFF \ -DWITH_INNODB_LZ4=OFF \ -DWITH_INNODB_LZMA=OFF \ -DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_SNAPPY=OFF \ -DWITH_MYSQLCOMPAT=ON \ -DSECURITY_HARDENED=OFF \ -DWITH_LIBARCHIVE=OFF \ -DWITH_LIBWRAP=OFF \ -DWITH_MARIABACKUP=OFF \ -DWITH_PIC=NO \ -DWITH_READLINE=OFF \ -DWITH_SAFEMALLOC=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_WSREP=OFF \ -DWITH_JEMALLOC=OFF \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ -DCOMPILATION_COMMENT="thelounge" %{__make} %{?_smp_mflags}
Regards, Sergei Chief Architect MariaDB and security@mariadb.org
Am 29.09.2017 um 08:45 schrieb Sergei Golubchik:
Hi, Reindl!
I was able to repeat this error using your cmake command-line. The culprit here is -DWITHOUT_DYNAMIC_PLUGINS=ON. The commit that introduced the bug (43b262af55db507320b165bb0f9abf05b2f05a89) makes
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
to be only done when dynamic plugins are enabled. But udf_example.so is built even without dynamic plugins.
Incidentally, this is already fixed in the latest 10.2 code - your exact cmake command-line completes successfully.
Sorry :(
so what now - i have planned deploayment of 10.2 with 10.2.9 and expected it next week or so - expierience says now it's at least a month - so please give me a unified diff which can be added to the rpm-sepc i thought there exists in the meantime a minimized build to avoid happening that again and again - at least it was planned after the last issues why in the world don't you announce RC tarballs as httpd, php and many other projects which are in the best case binary identidal to the following GA release - in that case you would get such bugs reported before the official release and that's IMHO something called QA
On Sep 28, Reindl Harald wrote:
it would be really cool if MariaDB minor updates (10.2.8 to 10.2.9 in that case) would work like for any other software - just replace the tarball, raise the version in the spec-file and hit "rpmbuild -bb mariadb.spec" ... cmake . \ -DFEATURE_SET="large" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_LAYOUT=RPM \ -DDAEMON_NAME="mysqld" \ -DDAEMON_NO_PREFIX="mysqld" \ -DNICE_PROJECT_NAME="MariaDB" \ -DINSTALL_LIBDIR="%{_lib}/mysql" \ -DINSTALL_MANDIR=share/man \ -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_MYSQLTESTDIR=share/mysql-test \ -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \ -DINSTALL_SBINDIR=libexec \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR=share/mysql \ -DMYSQL_DATADIR="%{_sharedstatedir}/mysql" \ -DMYSQL_UNIX_ADDR="%{_sharedstatedir}/mysql/mysql.sock" \ -DENABLED_PROFILING=OFF \ -DENABLE_DEBUG_SYNC=OFF \ -DENABLE_DTRACE=OFF \ -DPLUGIN_ARIA=YES \ -DPLUGIN_CSV=YES \ -DPLUGIN_MYISAM=YES \ -DPLUGIN_ARCHIVE=NO \ -DPLUGIN_BLACKHOLE=NO \ -DPLUGIN_CASSANDRA=NO \ -DPLUGIN_CONNECT=NO \ -DPLUGIN_EXAMPLE=NO \ -DPLUGIN_FEDERATED=NO \ -DPLUGIN_FEDERATEDX=NO \ -DPLUGIN_FEEDBACK=NO \ -DPLUGIN_MROONGA=NO \ -DPLUGIN_MYISAMMRG=NO \ -DPLUGIN_OQGRAPH=NO \ -DPLUGIN_PARTITION=NO \ -DPLUGIN_PERFSCHEMA=NO \ -DPLUGIN_ROCKSDB=NO \ -DPLUGIN_SEMISYNC=NO \ -DPLUGIN_SEQUENCE=NO \ -DPLUGIN_SPHINX=NO \ -DPLUGIN_SPIDER=NO \ -DPLUGIN_TOKUDB=NO \ -DPLUGIN_XTRADB=NO \ -DWITHOUT_DYNAMIC_PLUGINS=ON \ -DWITH_ATOMIC_OPS=smp \ -DWITH_EMBEDDED_SERVER=OFF \ -DWITH_INNODB_DISALLOW_WRITES=OFF \ -DWITH_INNODB_BZIP2=OFF \ -DWITH_INNODB_LZ4=OFF \ -DWITH_INNODB_LZMA=OFF \ -DWITH_INNODB_LZO=OFF \ -DWITH_INNODB_SNAPPY=OFF \ -DWITH_MYSQLCOMPAT=ON \ -DSECURITY_HARDENED=OFF \ -DWITH_LIBARCHIVE=OFF \ -DWITH_LIBWRAP=OFF \ -DWITH_MARIABACKUP=OFF \ -DWITH_PIC=NO \ -DWITH_READLINE=OFF \ -DWITH_SAFEMALLOC=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_WSREP=OFF \ -DWITH_JEMALLOC=OFF \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ -DCOMPILATION_COMMENT="thelounge" %{__make} %{?_smp_mflags}
Hi, Reindl! On Sep 29, Reindl Harald wrote:
Am 29.09.2017 um 08:45 schrieb Sergei Golubchik:
Hi, Reindl!
I was able to repeat this error using your cmake command-line. The culprit here is -DWITHOUT_DYNAMIC_PLUGINS=ON. The commit that introduced the bug (43b262af55db507320b165bb0f9abf05b2f05a89) makes
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
to be only done when dynamic plugins are enabled. But udf_example.so is built even without dynamic plugins.
Incidentally, this is already fixed in the latest 10.2 code - your exact cmake command-line completes successfully.
Sorry :(
so what now - i have planned deploayment of 10.2 with 10.2.9 and expected it next week or so - expierience says now it's at least a month - so please give me a unified diff which can be added to the rpm-sepc
Do you expect this diff to apply to 10.2.10 too? The short one could be: diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF() -IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags) It's not what we have in 10.2 now, but it's simple - just one line moved - and it helps in your case.
i thought there exists in the meantime a minimized build to avoid happening that again and again - at least it was planned after the last issues
Yes, but WITHOUT_DYNAMIC_PLUGINS is not part of it. We never build with WITHOUT_DYNAMIC_PLUGINS. Did you consider making your build a bit less, well, different? Regards, Sergei Chief Architect MariaDB and security@mariadb.org
Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
Hi, Reindl!
On Sep 29, Reindl Harald wrote:
Am 29.09.2017 um 08:45 schrieb Sergei Golubchik:
Hi, Reindl!
I was able to repeat this error using your cmake command-line. The culprit here is -DWITHOUT_DYNAMIC_PLUGINS=ON. The commit that introduced the bug (43b262af55db507320b165bb0f9abf05b2f05a89) makes
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
to be only done when dynamic plugins are enabled. But udf_example.so is built even without dynamic plugins.
Incidentally, this is already fixed in the latest 10.2 code - your exact cmake command-line completes successfully.
Sorry :(
so what now - i have planned deploayment of 10.2 with 10.2.9 and expected it next week or so - expierience says now it's at least a month - so please give me a unified diff which can be added to the rpm-sepc
Do you expect this diff to apply to 10.2.10 too?
i hope 10.2.10 won't need any patches
The short one could be:
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF()
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags)
+ /usr/bin/patch --no-backup-if-mismatch -p1 --fuzz=0 patching file sql/CMakeLists.txt Hunk #1 FAILED at 283. ______________________ + /usr/bin/patch --no-backup-if-mismatch -p0 --fuzz=0 can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt |--- a/sql/CMakeLists.txt |+++ b/sql/CMakeLists.txt
It's not what we have in 10.2 now, but it's simple - just one line moved - and it helps in your case.
i thought there exists in the meantime a minimized build to avoid happening that again and again - at least it was planned after the last issues
Yes, but WITHOUT_DYNAMIC_PLUGINS is not part of it. We never build with WITHOUT_DYNAMIC_PLUGINS. Did you consider making your build a bit less, well, different?
looking at the "rm -rf" orgy which is still useful in the %install section to get rid of a lot of stuff not needed in most setups and given that i maintain this specfile for many years and at least sun/oracle did not break every second point release build - no frankly what is the point of options "we never build with" in php you simply start with "--disable-all" followed by as much as needed --enable-stuff and you have a wroking "configure --help" - that's how a build is supposed to work
Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
Do you expect this diff to apply to 10.2.10 too? The short one could be:
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF()
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags)
besides that the patch-command don't like that copy&paste from a inline mail i don't see what that changes -IF(NOT WITHOUT_DYNAMIC_PLUGINS) +IF(NOT WITHOUT_DYNAMIC_PLUGINS) ______________________ IF(APPLE) # Add CoreServices framework since some dloadable plugins may need it FIND_LIBRARY(CORESERVICES NAMES CoreServices) IF(CORESERVICES) TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) ENDIF() ENDIF() IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags) ENDIF() IF (MINGW OR CYGWIN) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} -Wl,--export-all-symbols") ENDIF() IF(MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} \"${MYSQLD_EXP}\"") ADD_DEPENDENCIES(mysqld gen_mysqld_lib) ENDIF() ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
well, the attached patch works the many changes are because of poor source code quality with a wild mix of spaces and tabs for indents while any of my texteditors or IDE's convert tabs to spaces at save... Am 29.09.2017 um 13:28 schrieb Reindl Harald:
Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
Do you expect this diff to apply to 10.2.10 too? The short one could be:
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF()
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags)
besides that the patch-command don't like that copy&paste from a inline mail i don't see what that changes
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) +IF(NOT WITHOUT_DYNAMIC_PLUGINS) ______________________
IF(APPLE) # Add CoreServices framework since some dloadable plugins may need it FIND_LIBRARY(CORESERVICES NAMES CoreServices) IF(CORESERVICES) TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) ENDIF() ENDIF()
IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags) ENDIF() IF (MINGW OR CYGWIN) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} -Wl,--export-all-symbols") ENDIF() IF(MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} \"${MYSQLD_EXP}\"") ADD_DEPENDENCIES(mysqld gen_mysqld_lib) ENDIF() ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
Hi, Reindl! On Sep 29, Reindl Harald wrote:
Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
Do you expect this diff to apply to 10.2.10 too? The short one could be:
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF()
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags)
besides that the patch-command don't like that copy&paste from a inline mail i don't see what that changes
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) +IF(NOT WITHOUT_DYNAMIC_PLUGINS)
It moves this line to be below "IF(NOT MSVC)...ENDIF()" block, not above it. Regards, Sergei Chief Architect MariaDB and security@mariadb.org
participants (2)
-
Reindl Harald -
Sergei Golubchik