[PR PATCH] mariadb: fix prefix for scripts

[PR PATCH] mariadb: fix prefix for scripts

[classabbyamp]

[-- 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

Re: [PR PATCH] [Merged]: mariadb: fix prefix for scripts

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

There's a merged pull request on the void-packages repository

mariadb: fix prefix for scripts
https://github.com/void-linux/void-packages/pull/43794

Description:
fixes #43777

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**