mariadb: update to 10.4.18
Remove uClibc depends. It's gone now. Remove CMAKE_INSTALL to avoid installing to InstallDev. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
9543f72c77
commit
8a62f2ea6b
|
@ -8,7 +8,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=mariadb
|
PKG_NAME:=mariadb
|
||||||
PKG_VERSION:=10.4.17
|
PKG_VERSION:=10.4.18
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
@ -18,7 +18,7 @@ PKG_SOURCE_URL := \
|
||||||
https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
|
https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
|
||||||
https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source
|
https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source
|
||||||
|
|
||||||
PKG_HASH:=a7b104e264311cd46524ae546ff0c5107978373e4a01cf7fd8a241454548d16e
|
PKG_HASH:=330d9e8273002fc92f0f3f3f9b08157a3cab1265a0f114adeb6235e4283a0d3e
|
||||||
PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
|
PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
PKG_LICENSE_FILES:=COPYING THIRDPARTY
|
PKG_LICENSE_FILES:=COPYING THIRDPARTY
|
||||||
|
@ -33,8 +33,6 @@ HOST_BUILD_DEPENDS:=libxml2/host
|
||||||
# Without libevent2 tests/async_queries sporadically fails on the bots
|
# Without libevent2 tests/async_queries sporadically fails on the bots
|
||||||
PKG_BUILD_DEPENDS:=libevent2 mariadb/host
|
PKG_BUILD_DEPENDS:=libevent2 mariadb/host
|
||||||
|
|
||||||
CMAKE_INSTALL:=1
|
|
||||||
|
|
||||||
CONF_DIR:=/etc/mysql
|
CONF_DIR:=/etc/mysql
|
||||||
PLUGIN_DIR:=/usr/lib/mariadb/plugin
|
PLUGIN_DIR:=/usr/lib/mariadb/plugin
|
||||||
SHARE_DIR:=/usr/share/mariadb
|
SHARE_DIR:=/usr/share/mariadb
|
||||||
|
@ -178,8 +176,7 @@ MARIADB_COMMON_DEPENDS := \
|
||||||
+libatomic \
|
+libatomic \
|
||||||
+libopenssl \
|
+libopenssl \
|
||||||
+libstdcpp \
|
+libstdcpp \
|
||||||
+zlib \
|
+zlib
|
||||||
@!USE_UCLIBC
|
|
||||||
|
|
||||||
# Pass CPPFLAGS in the CFLAGS as otherwise the build system will
|
# Pass CPPFLAGS in the CFLAGS as otherwise the build system will
|
||||||
# ignore them.
|
# ignore them.
|
||||||
|
@ -478,11 +475,6 @@ define Build/Prepare
|
||||||
$(foreach p,$(MARIADB_DISABLE_PLUGINS),$(call Package/mariadb/disable/plugin,$(PKG_BUILD_DIR),$(p));)
|
$(foreach p,$(MARIADB_DISABLE_PLUGINS),$(call Package/mariadb/disable/plugin,$(PKG_BUILD_DIR),$(p));)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Define Build/InstallDev, otherwise build system starts installing files into
|
|
||||||
# staging area, which would interfere with mariadb-connector-c.
|
|
||||||
define Build/InstallDev
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/mariadb-client/install
|
define Package/mariadb-client/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
$(foreach b,$(MARIADB_CLIENT),$(call Package/mariadb/install/bin,$(1),$(b));)
|
$(foreach b,$(MARIADB_CLIENT),$(call Package/mariadb/install/bin,$(1),$(b));)
|
||||||
|
|
Loading…
Reference in New Issue