Browse Source

libmariadb: update to 3.8.10

Remove upstreamed patch.

Fixed license info.

Several whitespace changes.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
6e60d97564
2 changed files with 5 additions and 19 deletions
  1. +5
    -8
      libs/libmariadb/Makefile
  2. +0
    -11
      libs/libmariadb/patches/fix-ucontext-header.patch

+ 5
- 8
libs/libmariadb/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libmariadb PKG_NAME:=libmariadb
PKG_VERSION:=3.1.8
PKG_VERSION:=3.1.10
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz
@ -17,19 +17,16 @@ PKG_SOURCE_URL := \
https://mirror.lstn.net/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://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/connector-c-$(PKG_VERSION) \
https://downloads.mariadb.org/interstitial/connector-c-$(PKG_VERSION) https://downloads.mariadb.org/interstitial/connector-c-$(PKG_VERSION)
PKG_HASH:=af3e5613cb9e811f70db85a8a704c7140dc3e35f7c39912d0509511638f9658f
PKG_BUILD_DIR:=$(BUILD_DIR)/mariadb-connector-c-$(PKG_VERSION)-src
PKG_HASH:=431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net> PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING.LIB PKG_LICENSE_FILES:=COPYING.LIB
PKG_BUILD_DIR:=$(BUILD_DIR)/mariadb-connector-c-$(PKG_VERSION)-src
PKG_CPE_ID:=cpe:/a:mariadb:mariadb PKG_CPE_ID:=cpe:/a:mariadb:mariadb
PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_BUILD_PARALLEL:=1
MARIADB_CONF_DIR:=/etc/mysql MARIADB_CONF_DIR:=/etc/mysql
MARIADB_PLUGIN_DIR:=/usr/lib/mariadb/plugin MARIADB_PLUGIN_DIR:=/usr/lib/mariadb/plugin


+ 0
- 11
libs/libmariadb/patches/fix-ucontext-header.patch View File

@ -1,11 +0,0 @@
--- 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)

Loading…
Cancel
Save