Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffsync: Update syncstorage-rs to v0.17.4 #6228

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ffsync: Update syncstorage-rs to v0.17.4 #6228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d626bb
Update diesel to v2.2.4
mreid-tt Sep 12, 2024
2650aa6
Update mysql config
mreid-tt Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cross/diesel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = diesel
PKG_VERS = 2.1.6
PKG_VERS = 2.2.4
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/diesel-rs/diesel/archive
Expand All @@ -18,15 +18,15 @@ LICENSE = MIT
# build the cli tool for mysql
RUST_SRC_DIR = $(WORK_DIR)/$(PKG_DIR)/diesel_cli
CARGO_BUILD_ARGS += --no-default-features
CARGO_BUILD_ARGS += --features=mysql
CARGO_BUILD_ARGS += --features=mysql,mysqlclient-sys/buildtime_bindgen

# we support MariaDB 10 only
# we must define the mysql db socket, since the rust binaries (mysqlclient-sys)
# do not read settings from bin/mysql_conf
export "MYSQL_DB_SOCKET=/run/mysqld/mysqld10.sock"

# mysqlclient-sys: to find libmysqlclient
ENV += MYSQLCLIENT_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib
# let ./configure find mysql_config (it is a script and works for cross compile)
ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"
# to find dependencies of libmysqlclient (libz)
ENV += RUSTFLAGS="-Clink-arg=-Wl,--rpath,$(INSTALL_PREFIX)/lib -Clink-arg=-Wl,--rpath-link,$(STAGING_INSTALL_PREFIX)/lib"

Expand Down
6 changes: 3 additions & 3 deletions cross/diesel/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
diesel-2.1.6.tar.gz SHA1 ddb02dcb75dbfe03c8ab9cf905599390ae62d329
diesel-2.1.6.tar.gz SHA256 60775915f615d41b65f31861ed01e467961677b7e430c6cc58d22c0b9bc17baf
diesel-2.1.6.tar.gz MD5 294d6e5a841aaa4ec54ecf786f0e8993
diesel-2.2.4.tar.gz SHA1 89cb0abb070116154fb1cf23f43bfd4e8ca77c33
diesel-2.2.4.tar.gz SHA256 519e761055dea9abf6172b8ec15c0fd0da53c859e6b6809daeb104bbecd6fe57
diesel-2.2.4.tar.gz MD5 da184bae3ccb2c4d1478da157196f46c
Loading