Browse Source
Merge pull request #10570 from micmac1/maria-10.4
mariadb: major bump to 10.4, split off lib packagelilik-openwrt-22.03
Rosen Penev
5 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 673 additions and 537 deletions
Split View
Diff Options
-
+188 -0libs/libmariadb/Makefile
-
+0 -0libs/libmariadb/conf/50-client.cnf
-
+61 -0libs/libmariadb/files/mysql_config
-
+11 -0libs/libmariadb/patches/fix-ucontext-header.patch
-
+49 -0utils/mariadb-common/Makefile
-
+0 -0utils/mariadb-common/conf/my.cnf
-
+84 -125utils/mariadb/Makefile
-
+1 -1utils/mariadb/files/mysqld.init
-
+1 -1utils/mariadb/patches/100-fix_hostname.patch
-
+33 -8utils/mariadb/patches/110-pcre.cmake.patch
-
+45 -93utils/mariadb/patches/130-c11_atomics.patch
-
+112 -117utils/mariadb/patches/140-mips-connect-unaligned.patch
-
+9 -13utils/mariadb/patches/160-mips-machine.patch
-
+40 -74utils/mariadb/patches/170-ppc-remove-glibc-dep.patch
-
+0 -105utils/mariadb/patches/180-libedit.patch
-
+39 -0utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
+ 188
- 0
libs/libmariadb/Makefile
View File
| @ -0,0 +1,188 @@ | |||
| # | |||
| # Copyright (C) 2019 Sebastian Kemper <sebastian_ml@gmx.net> | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=libmariadb | |||
| PKG_VERSION:=3.1.5 | |||
| PKG_RELEASE:=1 | |||
| PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz | |||
| PKG_SOURCE_URL := \ | |||
| https://mirror.netcologne.de/mariadb/connector-c-$(PKG_VERSION) \ | |||
| https://mirror.lstn.net/mariadb/connector-c-$(PKG_VERSION) \ | |||
| https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/connector-c-$(PKG_VERSION) \ | |||
| https://downloads.mariadb.org/interstitial/connector-c-$(PKG_VERSION) | |||
| PKG_HASH:=a9de5fedd1a7805c86e23be49b9ceb79a86b090ad560d51495d7ba5952a9d9d5 | |||
| PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> | |||
| PKG_LICENSE:=LGPL-2.1 | |||
| PKG_LICENSE_FILES:=COPYING.LIB | |||
| PKG_BUILD_DIR:=$(BUILD_DIR)/mariadb-connector-c-$(PKG_VERSION)-src | |||
| PKG_CPE_ID:=cpe:/a:mariadb:mariadb | |||
| PKG_BUILD_PARALLEL:=1 | |||
| CMAKE_INSTALL:=1 | |||
| MARIADB_CONF_DIR:=/etc/mysql | |||
| MARIADB_PLUGIN_DIR:=/usr/lib/mariadb/plugin | |||
| MARIADB_PORT=3306 | |||
| MARIADB_SOCKET=/var/run/mysqld/mysqld.sock | |||
| MARIADB_CLIENT_PLUGINS := \ | |||
| auth_gssapi_client \ | |||
| remote_io | |||
| PKG_CONFIG_DEPENDS := \ | |||
| $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-plugin-%,$(subst _,-,$(MARIADB_CLIENT_PLUGINS))) | |||
| plugin-auth_gssapi_client := CLIENT_PLUGIN_AUTH_GSSAPI_CLIENT | |||
| plugin-remote_io := CLIENT_PLUGIN_REMOTE_IO | |||
| include $(INCLUDE_DIR)/package.mk | |||
| include $(INCLUDE_DIR)/cmake.mk | |||
| include $(INCLUDE_DIR)/nls.mk | |||
| # Pass CPPFLAGS in the CFLAGS as otherwise the build system will | |||
| # ignore them. | |||
| TARGET_CFLAGS+=$(TARGET_CPPFLAGS) | |||
| define Package/$(PKG_NAME)/install/plugin | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/$(2).so $(1)$(MARIADB_PLUGIN_DIR) | |||
| endef | |||
| define Package/$(PKG_NAME)/Default | |||
| SECTION:=libs | |||
| CATEGORY:=Libraries | |||
| URL:=https://mariadb.org/ | |||
| SUBMENU:=Database | |||
| endef | |||
| define Package/$(PKG_NAME)/description/Default | |||
| MariaDB is a very fast and robust SQL database server. | |||
| endef | |||
| define Package/$(PKG_NAME) | |||
| $(call Package/$(PKG_NAME)/Default) | |||
| DEPENDS:=+mariadb-common \ | |||
| $(ICONV_DEPENDS) \ | |||
| +libopenssl \ | |||
| +zlib | |||
| TITLE:=MariaDB database client library | |||
| MENU:=1 | |||
| PROVIDES:=libmariadbclient libmysqlclient libmysqlclient-r | |||
| ABI_VERSION:=3 | |||
| endef | |||
| define Package/$(PKG_NAME)/conffiles | |||
| $(MARIADB_CONF_DIR)/conf.d/50-client.cnf | |||
| endef | |||
| define Package/$(PKG_NAME)/description | |||
| $(call Package/$(PKG_NAME)/description/Default) | |||
| This package includes the client library. | |||
| endef | |||
| # We won't need unit tests | |||
| CMAKE_OPTIONS += -DWITH_UNIT_TESTS=0 | |||
| # Make it explicit that we are cross-compiling | |||
| CMAKE_OPTIONS += -DCMAKE_CROSSCOMPILING=1 | |||
| CMAKE_OPTIONS += \ | |||
| -DINSTALL_INCLUDEDIR=include/mysql \ | |||
| -DINSTALL_LIBDIR=lib \ | |||
| -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ | |||
| -DMARIADB_UNIX_ADDR=$(MARIADB_SOCKET) \ | |||
| -DWITH_EXTERNAL_ZLIB=YES \ | |||
| -DWITH_MYSQLCOMPAT=ON \ | |||
| -DWITH_SSL=OPENSSL | |||
| # Help MariaDB find the correct libiconv. | |||
| # nls.mk sets it up so that with CONFIG_BUILD_NLS libiconv-full would be used, | |||
| # otherwise libiconv-stub (independent of the selected libc). MariaDB needs a | |||
| # leg up to find/pick the right lib. | |||
| CMAKE_OPTIONS += \ | |||
| -DICONV_INCLUDE_DIR=$(ICONV_PREFIX)/include \ | |||
| -DICONV_LIBRARIES=$(ICONV_PREFIX)/lib/libiconv.$(if $(CONFIG_BUILD_NLS),so,a) | |||
| CMAKE_OPTIONS += \ | |||
| $(foreach p,$(MARIADB_CLIENT_PLUGINS),-D$(plugin-$(p))=$(if $(CONFIG_PACKAGE_$(PKG_NAME)-plugin-$(subst _,-,$(p))),DYNAMIC,OFF)) | |||
| # LIBICONV_PLUG is used in GNU's libiconv for redefinition of exports [e.g. | |||
| # from libiconv_open() to iconv_open()]. But in OpenWrt this variable is not set | |||
| # when building libiconv-full. So when MariaDB sets LIBICONV_PLUG it expects | |||
| # iconv_open() to be available for example, which is not the case - only | |||
| # libiconv_open() is. To address this prevent the variable from being set. | |||
| # libiconv-stub does not use this variable, so there is no harm in always doing | |||
| # this. | |||
| define Build/Prepare | |||
| $(call Build/Prepare/Default) | |||
| $(SED) '/ADD_DEFINITIONS(-DLIBICONV_PLUG)/d' $(PKG_BUILD_DIR)/CMakeLists.txt | |||
| endef | |||
| define Build/InstallDev | |||
| $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib/mysql $(1)/usr/lib/pkgconfig $(2)/bin | |||
| $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include | |||
| cd $(1)/usr/include/mysql; $(LN) mariadb_version.h mysql_version.h | |||
| $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{mariadb,mysqlclient}*.so* $(1)/usr/lib | |||
| cd $(1)/usr/lib/mysql; $(LN) ../lib{mariadb,mysqlclient}*.so* . | |||
| $(INSTALL_BIN) files/mysql_config $(1)/usr/bin | |||
| $(LN) $(STAGING_DIR)/usr/bin/mysql_config $(2)/bin | |||
| $(SED) 's/PORT/$(MARIADB_PORT)/' $(1)/usr/bin/mysql_config | |||
| $(SED) 's|PLUGIN_DIR|$(MARIADB_PLUGIN_DIR)|' $(1)/usr/bin/mysql_config | |||
| $(SED) 's|SOCKET|$(MARIADB_SOCKET)|' $(1)/usr/bin/mysql_config | |||
| cd "$(PKG_BUILD_DIR)/mariadb_config"; \ | |||
| CLIENT_VERSION=`sed -n 's|^#define[[:blank:]]*VERSION[[:blank:]]*"\([0-9.]*\)"|\1|p' mariadb_config.c`; \ | |||
| $(SED) "s/VERSION/$$$${CLIENT_VERSION}/" $(1)/usr/bin/mysql_config | |||
| $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmariadb.pc $(1)/usr/lib/pkgconfig | |||
| endef | |||
| define Package/$(PKG_NAME)/install | |||
| $(INSTALL_DIR) $(1)$(MARIADB_CONF_DIR)/conf.d | |||
| $(INSTALL_DIR) $(1)$(MARIADB_PLUGIN_DIR) | |||
| $(INSTALL_BIN) \ | |||
| $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/caching_sha2_password.so \ | |||
| $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/client_ed25519.so \ | |||
| $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/dialog.so \ | |||
| $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/mysql_clear_password.so \ | |||
| $(PKG_INSTALL_DIR)$(MARIADB_PLUGIN_DIR)/sha256_password.so \ | |||
| $(1)$(MARIADB_PLUGIN_DIR) | |||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmariadb.so.$(ABI_VERSION) $(1)/usr/lib | |||
| $(INSTALL_CONF) conf/50-client.cnf $(1)$(MARIADB_CONF_DIR)/conf.d | |||
| endef | |||
| define BuildPlugin | |||
| define Package/$(PKG_NAME)-plugin-$(subst _,-,$(1)) | |||
| $(call Package/$(PKG_NAME)/Default) | |||
| TITLE:=$(PKG_NAME) plugin | |||
| DEPENDS:=$(PKG_NAME) $(patsubst +%,+PACKAGE_$(PKG_NAME)-plugin-$(subst _,-,$(1)):%,$(2)) | |||
| endef | |||
| define Package/$(PKG_NAME)-plugin-$(subst _,-,$(1))/description | |||
| $(call Package/$(PKG_NAME)/description/Default) | |||
| This package provides the $(1) plugin. | |||
| endef | |||
| define Package/$(PKG_NAME)-plugin-$(subst _,-,$(1))/install | |||
| $(INSTALL_DIR) $$(1)$(MARIADB_PLUGIN_DIR) | |||
| $(call Package/$(PKG_NAME)/install/plugin,$$(1),$(1)) | |||
| endef | |||
| $$(eval $$(call BuildPackage,$(PKG_NAME)-plugin-$(subst _,-,$(1)))) | |||
| endef | |||
| $(eval $(call BuildPackage,$(PKG_NAME))) | |||
| $(eval $(call BuildPlugin,auth_gssapi_client,+krb5-libs)) | |||
| $(eval $(call BuildPlugin,remote_io,+libcurl)) | |||
utils/mariadb/conf/50-client.cnf → libs/libmariadb/conf/50-client.cnf
View File
+ 61
- 0
libs/libmariadb/files/mysql_config
View File
| @ -0,0 +1,61 @@ | |||
| #!/bin/sh | |||
| PCFILE=libmariadb | |||
| command -v pkg-config > /dev/null 2>&1 | |||
| ret="$?" | |||
| if [ "$ret" -ne 0 ]; then | |||
| echo pkg-config not found >&2 | |||
| exit 1 | |||
| fi | |||
| pkg-config $PCFILE > /dev/null 2>&1 | |||
| ret="$?" | |||
| if [ "$ret" -ne 0 ]; then | |||
| echo $PCFILE pkg-config file missing >&2 | |||
| exit 1 | |||
| fi | |||
| cflags=$(pkg-config $PCFILE --cflags) | |||
| include=$(pkg-config $PCFILE --cflags) | |||
| libs=$(pkg-config $PCFILE --libs) | |||
| plugindir=PLUGIN_DIR | |||
| socket=SOCKET | |||
| port=PORT | |||
| version=VERSION | |||
| usage () { | |||
| cat <<EOF | |||
| Usage: $0 [OPTIONS] | |||
| Options: | |||
| --cflags [$cflags] | |||
| --include [$include] | |||
| --libs [$libs] | |||
| --libs_r [$libs] | |||
| --plugindir [$plugindir] | |||
| --socket [$socket] | |||
| --port [$port] | |||
| --version [$version] | |||
| EOF | |||
| exit "$1" | |||
| } | |||
| if test $# -le 0; then usage 0 ; fi | |||
| while test $# -gt 0; do | |||
| case $1 in | |||
| --cflags) echo "$cflags" ;; | |||
| --include) echo "$include" ;; | |||
| --libs) echo "$libs" ;; | |||
| --libs_r) echo "$libs" ;; | |||
| --plugindir) echo "$plugindir" ;; | |||
| --socket) echo "$socket" ;; | |||
| --port) echo "$port" ;; | |||
| --version) echo "$version" ;; | |||
| *) usage 1 >&2 ;; | |||
| esac | |||
| shift | |||
| done | |||
| exit 0 | |||
+ 11
- 0
libs/libmariadb/patches/fix-ucontext-header.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/cmake/CheckIncludeFiles.cmake | |||
| +++ b/cmake/CheckIncludeFiles.cmake | |||
| @@ -46,4 +46,7 @@ | |||
| CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H) | |||
| CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) | |||
| CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H) | |||
| -CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H) | |||
| +CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_HEADER) | |||
| +IF(HAVE_UCONTEXT_HEADER) | |||
| + CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) | |||
| +ENDIF(HAVE_UCONTEXT_HEADER) | |||
+ 49
- 0
utils/mariadb-common/Makefile
View File
| @ -0,0 +1,49 @@ | |||
| # | |||
| # Copyright (C) 2019 Sebastian Kemper <sebastian_ml@gmx.net> | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=mariadb-common | |||
| PKG_VERSION:=1.0 | |||
| PKG_RELEASE:=1 | |||
| PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> | |||
| PKG_LICENSE:=GPL-2.0 | |||
| CONF_DIR:=/etc/mysql | |||
| include $(INCLUDE_DIR)/package.mk | |||
| define Package/mariadb-common | |||
| SECTION:=utils | |||
| CATEGORY:=Utilities | |||
| URL:=https://mariadb.org/ | |||
| SUBMENU:=Database | |||
| TITLE:=MariaDB database common files | |||
| DEPENDS:= | |||
| endef | |||
| define Package/mariadb-common/conffiles | |||
| $(CONF_DIR)/my.cnf | |||
| endef | |||
| define Package/mariadb-common/description | |||
| MariaDB is a very fast and robust SQL database server. | |||
| This package includes shared files, for example $(CONF_DIR)/my.cnf. | |||
| endef | |||
| define Package/mariadb-common/install | |||
| $(INSTALL_DIR) $(1)$(CONF_DIR) | |||
| $(INSTALL_CONF) conf/my.cnf $(1)$(CONF_DIR) | |||
| endef | |||
| define Build/Compile | |||
| endef | |||
| $(eval $(call BuildPackage,mariadb-common)) | |||
utils/mariadb/conf/my.cnf → utils/mariadb-common/conf/my.cnf
View File
+ 84
- 125
utils/mariadb/Makefile
View File
+ 1
- 1
utils/mariadb/files/mysqld.init
View File
+ 1
- 1
utils/mariadb/patches/100-fix_hostname.patch
View File
+ 33
- 8
utils/mariadb/patches/110-pcre.cmake.patch
View File
| @ -1,11 +1,36 @@ | |||
| From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@debian.org> | |||
| Date: Wed, 22 Nov 2017 06:05:45 +0000 | |||
| Subject: Revert to using system pcre library | |||
| --- | |||
| cmake/pcre.cmake | 16 ++-------------- | |||
| 1 file changed, 2 insertions(+), 14 deletions(-) | |||
| --- a/cmake/pcre.cmake | |||
| +++ b/cmake/pcre.cmake | |||
| @@ -14,6 +14,8 @@ MACRO (CHECK_PCRE) | |||
| return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256; | |||
| }" PCRE_STACK_SIZE_OK) | |||
| SET(CMAKE_REQUIRED_LIBRARIES) | |||
| + ELSE() | |||
| + SET(PCRE_STACK_SIZE_OK TRUE) | |||
| ENDIF() | |||
| @@ -1,23 +1,11 @@ | |||
| -INCLUDE (CheckCSourceRuns) | |||
| - | |||
| SET(WITH_PCRE "auto" CACHE STRING | |||
| "Which pcre to use (possible values are 'bundled', 'system', or 'auto')") | |||
| MACRO (CHECK_PCRE) | |||
| IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto") | |||
| - CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD) | |||
| - IF(NOT CMAKE_CROSSCOMPILING) | |||
| - SET(CMAKE_REQUIRED_LIBRARIES "pcre") | |||
| - CHECK_C_SOURCE_RUNS(" | |||
| - #include <pcre.h> | |||
| - int main() { | |||
| - return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256; | |||
| - }" PCRE_STACK_SIZE_OK) | |||
| - SET(CMAKE_REQUIRED_LIBRARIES) | |||
| - ENDIF() | |||
| + CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE) | |||
| ENDIF() | |||
| IF(NOT HAVE_PCRE_STACK_GUARD OR NOT PCRE_STACK_SIZE_OK OR | |||
| - IF(NOT HAVE_PCRE_STACK_GUARD OR NOT PCRE_STACK_SIZE_OK OR | |||
| - WITH_PCRE STREQUAL "bundled") | |||
| + IF(NOT HAVE_PCRE OR WITH_PCRE STREQUAL "bundled") | |||
| IF (WITH_PCRE STREQUAL "system") | |||
| MESSAGE(FATAL_ERROR "system pcre is not found or unusable") | |||
| ENDIF() | |||
+ 45
- 93
utils/mariadb/patches/130-c11_atomics.patch
View File
| @ -1,112 +1,64 @@ | |||
| Description: Fix mips missing atomics primitives | |||
| On mips we don't have native support for 64bit atomic operations. Make use | |||
| of libatomic to emulate them. | |||
| Author: Vicențiu Ciorbaru <vicentiu@mariadb.org> | |||
| Date: Fri Dec 21 19:14:04 2018 +0200 | |||
| Link with libatomic to enable C11 atomics support | |||
| Some architectures (mips) require libatomic to support proper | |||
| atomic operations. Check first if support is available without | |||
| linking, otherwise use the library. | |||
| --- a/configure.cmake | |||
| +++ b/configure.cmake | |||
| @@ -128,7 +128,7 @@ IF(UNIX) | |||
| ENDIF() | |||
| FIND_PACKAGE(Threads) | |||
| - SET(CMAKE_REQUIRED_LIBRARIES | |||
| + LIST(APPEND CMAKE_REQUIRED_LIBRARIES | |||
| ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}) | |||
| # Need explicit pthread for gcc -fsanitize=address | |||
| IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=") | |||
| @@ -952,7 +952,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS) | |||
| long long int *ptr= &var; | |||
| return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | |||
| }" | |||
| - HAVE_GCC_C11_ATOMICS) | |||
| + HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | |||
| + IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | |||
| @@ -866,7 +866,25 @@ int main() | |||
| long long int *ptr= &var; | |||
| return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | |||
| }" | |||
| -HAVE_GCC_C11_ATOMICS) | |||
| +HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | |||
| +IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | |||
| + SET(HAVE_GCC_C11_ATOMICS True) | |||
| +ELSE() | |||
| + SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) | |||
| + LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") | |||
| + CHECK_CXX_SOURCE_COMPILES(" | |||
| + int main() | |||
| + { | |||
| + long long int var= 1; | |||
| + long long int *ptr= &var; | |||
| + return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | |||
| + }" | |||
| + HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + SET(HAVE_GCC_C11_ATOMICS True) | |||
| + ELSE() | |||
| + SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) | |||
| + LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") | |||
| + CHECK_CXX_SOURCE_COMPILES(" | |||
| + int main() | |||
| + { | |||
| + long long int var= 1; | |||
| + long long int *ptr= &var; | |||
| + return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | |||
| + }" | |||
| + HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + SET(HAVE_GCC_C11_ATOMICS True) | |||
| + ELSE() | |||
| + SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) | |||
| + ENDIF() | |||
| + ENDIF() | |||
| ELSE() | |||
| MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!") | |||
| ENDIF() | |||
| --- a/include/atomic/gcc_builtins.h | |||
| +++ b/include/atomic/gcc_builtins.h | |||
| @@ -16,6 +16,7 @@ | |||
| along with this program; if not, write to the Free Software | |||
| Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ | |||
| +#if defined (HAVE_GCC_ATOMIC_BUILTINS) | |||
| #define make_atomic_add_body(S) \ | |||
| v= __sync_fetch_and_add(a, v); | |||
| #define make_atomic_fas_body(S) \ | |||
| @@ -26,6 +27,20 @@ | |||
| sav= __sync_val_compare_and_swap(a, cmp_val, set);\ | |||
| if (!(ret= (sav == cmp_val))) *cmp= sav | |||
| + SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) | |||
| +ENDIF() | |||
| +#elif defined(HAVE_GCC_C11_ATOMICS) | |||
| + | |||
| +#define make_atomic_add_body(S) \ | |||
| + v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST) | |||
| +#define make_atomic_fas_body(S) \ | |||
| + v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST) | |||
| +#define make_atomic_cas_body(S) \ | |||
| + int ## S sav; \ | |||
| + ret= __atomic_compare_exchange_n(a, cmp, set, \ | |||
| + 0, \ | |||
| + __ATOMIC_SEQ_CST,\ | |||
| + __ATOMIC_SEQ_CST); | |||
| +#endif | |||
| + | |||
| #ifdef MY_ATOMIC_MODE_DUMMY | |||
| #define make_atomic_load_body(S) ret= *a | |||
| #define make_atomic_store_body(S) *a= v | |||
| IF(WITH_VALGRIND) | |||
| SET(HAVE_valgrind 1) | |||
| --- a/mysys/CMakeLists.txt | |||
| +++ b/mysys/CMakeLists.txt | |||
| @@ -81,6 +81,10 @@ IF(HAVE_BFD_H) | |||
| TARGET_LINK_LIBRARIES(mysys bfd) | |||
| ENDIF(HAVE_BFD_H) | |||
| @@ -72,6 +72,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings | |||
| ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) | |||
| DTRACE_INSTRUMENT(mysys) | |||
| +IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + TARGET_LINK_LIBRARIES(mysys atomic) | |||
| +ENDIF() | |||
| + | |||
| IF (WIN32) | |||
| TARGET_LINK_LIBRARIES(mysys IPHLPAPI) | |||
| ENDIF(WIN32) | |||
| IF(HAVE_BFD_H) | |||
| TARGET_LINK_LIBRARIES(mysys bfd) | |||
| ENDIF(HAVE_BFD_H) | |||
| --- a/sql/CMakeLists.txt | |||
| +++ b/sql/CMakeLists.txt | |||
| @@ -170,6 +170,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI | |||
| ${SSL_LIBRARIES} | |||
| ${LIBSYSTEMD}) | |||
| @@ -190,6 +190,10 @@ ELSE() | |||
| SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) | |||
| ENDIF() | |||
| +IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | |||
| + TARGET_LINK_LIBRARIES(sql atomic) | |||
| +ENDIF() | |||
| + | |||
| IF(WIN32) | |||
| SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc) | |||
| TARGET_LINK_LIBRARIES(sql psapi) | |||
| --- a/include/my_atomic.h | |||
| +++ b/include/my_atomic.h | |||
| @@ -126,7 +126,7 @@ | |||
| #include "atomic/generic-msvc.h" | |||
| #elif defined(HAVE_SOLARIS_ATOMIC) | |||
| #include "atomic/solaris.h" | |||
| -#elif defined(HAVE_GCC_ATOMIC_BUILTINS) | |||
| +#elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) | |||
| #include "atomic/gcc_builtins.h" | |||
| #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) | |||
| #include "atomic/x86-gcc.h" | |||
| IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) | |||
+ 112
- 117
utils/mariadb/patches/140-mips-connect-unaligned.patch
View File
+ 9
- 13
utils/mariadb/patches/160-mips-machine.patch
View File
+ 40
- 74
utils/mariadb/patches/170-ppc-remove-glibc-dep.patch
View File
| @ -1,79 +1,45 @@ | |||
| From f5cf70d9d1dc7f4cbeffb7fb75cbbe08720e3873 Mon Sep 17 00:00:00 2001 | |||
| From: Gustavo Romero <gromero@br.ibm.com> | |||
| Date: Sun, 26 Mar 2017 15:08:15 +0000 | |||
| Subject: [PATCH] Remove dependency on glibc on PPC | |||
| Remove dependency on glibc by using gcc builtin function and no glibc | |||
| wrappers. | |||
| Currently there are no surrogates in musl for: | |||
| __ppc_get_timebase() | |||
| __ppc_set_ppr_low() | |||
| __ppc_set_ppr_med() | |||
| however glibc __ppc_get_timebase() is just a wrapper for GCC builtin | |||
| __builtin_get_timebase() available since GCC 4.8 [1], so assuming that | |||
| aports on ppc64le will never be built using GCC < 4.8 we can just | |||
| switch directly to the GCC builtin function. | |||
| Also __ppc_set_ppr_{low,med}() are not available on musl but both | |||
| are simple glibc wrappers on a single asm instruction, hence there | |||
| is no harm in using asm directly instead. Actually, using asm | |||
| directly was the first solution adopted in MariaDB [2]. | |||
| [1] https://goo.gl/jxLV6O | |||
| [2] https://goo.gl/9bjuVC | |||
| --- a/storage/xtradb/include/ut0ut.h | |||
| +++ b/storage/xtradb/include/ut0ut.h | |||
| @@ -83,9 +83,8 @@ private: | |||
| the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- | |||
| independent way by using YieldProcessor. */ | |||
| # define UT_RELAX_CPU() YieldProcessor() | |||
| -# elif defined(__powerpc__) && defined __GLIBC__ | |||
| -#include <sys/platform/ppc.h> | |||
| -# define UT_RELAX_CPU() __ppc_get_timebase() | |||
| +# elif defined(__powerpc__) | |||
| +# define UT_RELAX_CPU() __builtin_ppc_get_timebase() | |||
| # else | |||
| # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ | |||
| # endif | |||
| @@ -99,9 +98,8 @@ private: | |||
| #endif | |||
| --- a/include/my_cpu.h | |||
| +++ b/include/my_cpu.h | |||
| @@ -24,17 +24,16 @@ | |||
| */ | |||
| # if defined(HAVE_HMT_PRIORITY_INSTRUCTION) | |||
| #ifdef _ARCH_PWR8 | |||
| -#include <sys/platform/ppc.h> | |||
| -# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low() | |||
| -# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med() | |||
| +# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") | |||
| +# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2") | |||
| # else | |||
| # define UT_LOW_PRIORITY_CPU() ((void)0) | |||
| # define UT_RESUME_PRIORITY_CPU() ((void)0) | |||
| --- a/storage/innobase/include/ut0ut.h | |||
| +++ b/storage/innobase/include/ut0ut.h | |||
| @@ -68,9 +68,8 @@ Created 1/20/1994 Heikki Tuuri | |||
| the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- | |||
| independent way by using YieldProcessor. */ | |||
| # define UT_RELAX_CPU() YieldProcessor() | |||
| -#elif defined(__powerpc__) && defined __GLIBC__ | |||
| -# include <sys/platform/ppc.h> | |||
| -# define UT_RELAX_CPU() __ppc_get_timebase() | |||
| +#elif defined(__powerpc__) | |||
| +# define UT_RELAX_CPU() __builtin_ppc_get_timebase() | |||
| /* Very low priority */ | |||
| -#define HMT_very_low() __ppc_set_ppr_very_low() | |||
| +#define HMT_very_low() asm volatile("or 31,31,31") | |||
| /* Low priority */ | |||
| -#define HMT_low() __ppc_set_ppr_low() | |||
| +#define HMT_low() asm volatile ("or 1,1,1") | |||
| /* Medium low priority */ | |||
| -#define HMT_medium_low() __ppc_set_ppr_med_low() | |||
| +#define HMT_medium_low() asm volatile ("or 6,6,6") | |||
| /* Medium priority */ | |||
| -#define HMT_medium() __ppc_set_ppr_med() | |||
| +#define HMT_medium() asm volatile ("or 2,2,2") | |||
| /* Medium high priority */ | |||
| -#define HMT_medium_high() __ppc_set_ppr_med_high() | |||
| +#define HMT_medium_high() asm volatile("or 5,5,5") | |||
| /* High priority */ | |||
| #define HMT_high() asm volatile("or 3,3,3") | |||
| #else | |||
| # define UT_RELAX_CPU() do { \ | |||
| volatile int32 volatile_var; \ | |||
| @@ -88,9 +87,8 @@ Created 1/20/1994 Heikki Tuuri | |||
| @@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void) | |||
| __asm__ __volatile__ ("pause"); | |||
| #endif | |||
| #if defined(HAVE_HMT_PRIORITY_INSTRUCTION) | |||
| -# include <sys/platform/ppc.h> | |||
| -# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low() | |||
| -# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med() | |||
| +# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") | |||
| +# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2") | |||
| #elif defined(_ARCH_PWR8) | |||
| - __ppc_get_timebase(); | |||
| + __builtin_ppc_get_timebase(); | |||
| #else | |||
| # define UT_LOW_PRIORITY_CPU() ((void)0) | |||
| # define UT_RESUME_PRIORITY_CPU() ((void)0) | |||
| int32 var, oldval = 0; | |||
| my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, | |||
| --- a/storage/tokudb/PerconaFT/portability/toku_time.h | |||
| +++ b/storage/tokudb/PerconaFT/portability/toku_time.h | |||
| @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v | |||
| __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); | |||
| return result; | |||
| #elif defined(__powerpc__) | |||
| - return __ppc_get_timebase(); | |||
| + return __builtin_ppc_get_timebase(); | |||
| #else | |||
| #error No timer implementation for this platform | |||
| #endif | |||
+ 0
- 105
utils/mariadb/patches/180-libedit.patch
View File
| @ -1,105 +0,0 @@ | |||
| commit 2220f7458ef90829eacc457167a28aeba75ca1bc | |||
| Author: Sebastian Kemper <sebastian_ml@gmx.net> | |||
| Date: Sun Dec 9 21:19:24 2018 +0100 | |||
| cmake: support new libedit interface | |||
| 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> | |||
| --- a/client/mysql.cc | |||
| +++ b/client/mysql.cc | |||
| @@ -2578,7 +2578,7 @@ C_MODE_END | |||
| if not. | |||
| */ | |||
| -#if defined(USE_NEW_READLINE_INTERFACE) | |||
| +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_NEW_LIBEDIT_INTERFACE) | |||
| static int fake_magic_space(int, int); | |||
| extern "C" char *no_completion(const char*,int) | |||
| #elif defined(USE_LIBEDIT_INTERFACE) | |||
| @@ -2660,7 +2660,7 @@ static int not_in_history(const char *li | |||
| } | |||
| -#if defined(USE_NEW_READLINE_INTERFACE) | |||
| +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_NEW_LIBEDIT_INTERFACE) | |||
| static int fake_magic_space(int, int) | |||
| #else | |||
| static int fake_magic_space(const char *, int) | |||
| @@ -2677,7 +2677,7 @@ static void initialize_readline (char *n | |||
| rl_readline_name = name; | |||
| /* Tell the completer that we want a crack first. */ | |||
| -#if defined(USE_NEW_READLINE_INTERFACE) | |||
| +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_NEW_LIBEDIT_INTERFACE) | |||
| rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; | |||
| rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; | |||
| @@ -2707,7 +2707,7 @@ static char **new_mysql_completion(const | |||
| int end __attribute__((unused))) | |||
| { | |||
| if (!status.batch && !quick) | |||
| -#if defined(USE_NEW_READLINE_INTERFACE) | |||
| +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_NEW_LIBEDIT_INTERFACE) | |||
| return rl_completion_matches(text, new_command_generator); | |||
| #else | |||
| return completion_matches((char *)text, (CPFunction *)new_command_generator); | |||
| --- a/cmake/readline.cmake | |||
| +++ b/cmake/readline.cmake | |||
| @@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) | |||
| int res= (*rl_completion_entry_function)(0,0); | |||
| completion_matches(0,0); | |||
| }" | |||
| - LIBEDIT_INTERFACE) | |||
| - SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) | |||
| + LIBEDIT_HAVE_COMPLETION_INT) | |||
| + | |||
| + CHECK_CXX_SOURCE_COMPILES(" | |||
| + #include <stdio.h> | |||
| + #include <readline.h> | |||
| + int main(int argc, char **argv) | |||
| + { | |||
| + char res= *(*rl_completion_entry_function)(0,0); | |||
| + completion_matches(0,0); | |||
| + }" | |||
| + LIBEDIT_HAVE_COMPLETION_CHAR) | |||
| + IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR) | |||
| + SET(USE_LIBEDIT_INTERFACE 1) | |||
| + ENDIF() | |||
| ENDIF() | |||
| ENDMACRO() | |||
| @@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE) | |||
| IF(USE_LIBEDIT_INTERFACE) | |||
| SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) | |||
| SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) | |||
| + SET(USE_NEW_LIBEDIT_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR}) | |||
| ELSE() | |||
| MYSQL_USE_BUNDLED_READLINE() | |||
| ENDIF() | |||
| --- a/config.h.cmake | |||
| +++ b/config.h.cmake | |||
| @@ -113,6 +113,7 @@ | |||
| /* Readline */ | |||
| #cmakedefine HAVE_HIST_ENTRY 1 | |||
| #cmakedefine USE_LIBEDIT_INTERFACE 1 | |||
| +#cmakedefine USE_NEW_LIBEDIT_INTERFACE 1 | |||
| #cmakedefine USE_NEW_READLINE_INTERFACE 1 | |||
| #cmakedefine FIONREAD_IN_SYS_IOCTL 1 | |||
+ 39
- 0
utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
View File
| @ -0,0 +1,39 @@ | |||
| --- a/scripts/mysql_install_db.sh | |||
| +++ b/scripts/mysql_install_db.sh | |||
| @@ -359,6 +359,14 @@ then | |||
| exit 1 | |||
| fi | |||
| plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin` | |||
| + # Upstream assumes all plugins will be always installed, but in OpenWrt we can | |||
| + # install a server without plugins if we want to. | |||
| + if test -z "$plugindir" | |||
| + then | |||
| + echo "Could not find plugin directory." >&2 | |||
| + echo "Will continue with \"/usr/lib/mariadb/plugin\"." >&2 | |||
| + plugindir=/usr/lib/mariadb/plugin | |||
| + fi | |||
| pamtooldir=$plugindir | |||
| # relative from where the script was run for a relocatable install | |||
| elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld" | |||
| @@ -478,7 +486,9 @@ do | |||
| fi | |||
| done | |||
| -if test -n "$user" | |||
| +# There should be no need for this on OpenWrt. If this turns out to be a wrong guess then | |||
| +# we can revisit. | |||
| +if test -n "" | |||
| then | |||
| chown $user "$pamtooldir/auth_pam_tool_dir" && \ | |||
| chmod 0700 "$pamtooldir/auth_pam_tool_dir" | |||
| @@ -499,6 +509,10 @@ then | |||
| echo | |||
| fi | |||
| fi | |||
| +fi | |||
| + | |||
| +if test -n "$user" | |||
| +then | |||
| args="$args --user=$user" | |||
| fi | |||