From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mariadb: fix prefix for scripts
Date: Sun, 07 May 2023 20:30:59 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43794@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages mariadb/fix-paths
https://github.com/void-linux/void-packages/pull/43794
mariadb: fix prefix for scripts
fixes #43777
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/43794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb/fix-paths-43794.patch --]
[-- Type: text/x-diff, Size: 1826 bytes --]
From c6b4e3f84ffa56ba2e290b7b58d237e1996bc196 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 7 May 2023 14:30:00 -0400
Subject: [PATCH] mariadb: fix prefix for scripts
fixes #43777
---
.../mariadb/patches/fix-install-layout.patch | 22 +++++++++++++++++++
srcpkgs/mariadb/template | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mariadb/patches/fix-install-layout.patch
diff --git a/srcpkgs/mariadb/patches/fix-install-layout.patch b/srcpkgs/mariadb/patches/fix-install-layout.patch
new file mode 100644
index 000000000000..b010deb49f7a
--- /dev/null
+++ b/srcpkgs/mariadb/patches/fix-install-layout.patch
@@ -0,0 +1,22 @@
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -88,7 +88,7 @@
+ ELSEIF(INSTALL_LAYOUT MATCHES "SVR4")
+ SET(default_prefix "/opt/mysql/mysql")
+ ELSE()
+- SET(default_prefix "/usr/local/mysql")
++ SET(default_prefix "/usr")
+ ENDIF()
+ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ SET(CMAKE_INSTALL_PREFIX ${default_prefix}
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -181,7 +181,7 @@
+ # the documentation, so better not change this.
+
+ IF(INSTALL_LAYOUT MATCHES "STANDALONE")
+- SET(prefix ".")
++ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+ SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+ SET(scriptdir ${prefix}/${INSTALL_BINDIR})
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 71409f89930c..b299a2e9e426 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=4
+revision=5
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
next reply other threads:[~2023-05-07 18:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-07 18:30 classabbyamp [this message]
2023-05-17 5:42 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43794@inbox.vuxu.org \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).