pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases/mysql80-client



Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov 26 12:25:22 UTC 2022

Modified Files:
        pkgsrc/databases/mysql80-client: distinfo
Added Files:
        pkgsrc/databases/mysql80-client/patches:
            patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h

Log Message:
mysql80-client: Fix a Linuxism.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.6 pkgsrc/databases/mysql80-client/distinfo:1.7
--- pkgsrc/databases/mysql80-client/distinfo:1.6        Wed Nov  2 17:02:10 2022
+++ pkgsrc/databases/mysql80-client/distinfo    Sat Nov 26 12:25:22 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2022/11/02 17:02:10 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2022/11/26 12:25:22 nia Exp $
 
 BLAKE2s (mysql-boost-8.0.31.tar.gz) = 2da23b9233a2c5060aa22074cbe990d0dc1d90b2e55a4cd4b32571d2c77fe3bf
 SHA512 (mysql-boost-8.0.31.tar.gz) = 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
@@ -31,5 +31,6 @@ SHA1 (patch-sql_conn__handler_socket__co
 SHA1 (patch-sql_join__optimizer_bit__utils.h) = 3e75331da6b50935f082b2f738e6c6964afef5f7
 SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc) = e08ed53790ac8b03b38d566fee3a2688ca6065b3
 SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc) = 1ce0aec798a22f966c37d9ee38b3dee3d855a7e3
+SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h) = cc5bdab29e542f172dc6d4c0d4af1f264e37ba35
 SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-solaris.h) = 2b41381af66e22231e897ebc97346c13b1f1e3a7
 SHA1 (patch-vio_viosocket.cc) = fcbe1eccb58fb840857f22178291ed2fb2c870b0

Added files:

Index: pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h:1.1
--- /dev/null   Sat Nov 26 12:25:22 2022
+++ pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h Sat Nov 26 12:25:22 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h,v 1.1 2022/11/26 12:25:22 nia Exp $
+
+MAP_HUGETLB is unavailable on other operating systems than FreeBSD,
+correctly map it as a Linuxism.
+
+--- storage/innobase/include/detail/ut/large_page_alloc-linux.h.orig   2022-09-13 16:15:16.000000000 +0000
++++ storage/innobase/include/detail/ut/large_page_alloc-linux.h
+@@ -52,7 +52,7 @@ inline void *large_page_aligned_alloc(si
+   // mmap will internally round n_bytes to the multiple of huge-page size if it
+   // is not already
+   int mmap_flags = MAP_PRIVATE | MAP_ANON;
+-#ifndef __FreeBSD__
++#ifdef __linux
+   mmap_flags |= MAP_HUGETLB;
+ #endif
+   void *ptr = mmap(nullptr, n_bytes, PROT_READ | PROT_WRITE, mmap_flags, -1, 0);



Home | Main Index | Thread Index | Old Index