Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-11-17 20:03:41 +00:00
5 changed files with 101 additions and 0 deletions

View File

@@ -1 +1,2 @@
DIST libzdb-3.2.3.tar.gz 771263 BLAKE2B a734dbee38ad175cd4d60afc7fe38c72318d5c74daf1556587997e592b2136d96fc747210aac4151764d8644a8b657a9364ffc1c7fcb133d8487f2585c12c22c SHA512 3cf0641a7aabf91fa9bc7ed93bce6fa3e692cad309086e3f899ede443ffdd84ed20dda38fbc48764733537cdc105ae7e555a23cf7bc9b8f99e233787e0271e29
DIST libzdb-3.4.0.tar.gz 956184 BLAKE2B b75d35c4061d3b98e88f82515f1289c22fb364eefca8e28cab870fb2cea3206511e7e2d34daf8017b4c129602e5cfbd260f894970603e35cae7827e123f793f6 SHA512 b3363c9d4fb9c5a7e076d2ab465b43e9ed4a4332f5020b22b8229f049f8f8644a20a72a6f36f7e7cb37fa6e1fd7532b051be06c2f33245ff16de9cd91dc05b3a

View File

@@ -0,0 +1,86 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A thread safe high level multi-database connection pool library"
HOMEPAGE="https://www.tildeslash.com/libzdb/"
SRC_URI="https://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc mysql postgres +sqlite ssl static-libs"
REQUIRED_USE=" || ( postgres mysql sqlite )"
RESTRICT=test
RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
postgres? ( dev-db/postgresql:* )
sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
ssl? ( dev-libs/openssl:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-text/doxygen )"
src_prepare() {
default
sed -i -e "s|&& ./pool||g" test/Makefile.in || die
}
src_configure() {
## TODO: check what --enable-optimized actually does
## TODO: find someone with oracle db to add oci8 support
myconf=""
# enable default hidden visibility
myconf="${myconf} --enable-protected"
if use sqlite; then
myconf="${myconf} --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
else
myconf="${myconf} --without-sqlite"
fi
if use mysql; then
myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
else
myconf="${myconf} --without-mysql"
fi
if use postgres; then
myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
else
myconf="${myconf} --without-postgresql"
fi
econf \
$(use_enable debug profiling) \
$(use_enable static-libs static) \
$(use_enable ssl openssl) \
--without-oci \
${myconf}
}
src_compile() {
default
if use doc; then
emake doc
fi
}
src_install() {
default
# the --disable-static flag only skips .a
use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
dodoc AUTHORS CHANGES README
if use doc;then
docinto html
dodoc -r "${S}/doc/api-docs"/*
fi
}
src_test() {
emake verify
}

View File

@@ -0,0 +1,11 @@
diff '--color=auto' -ruN oprofile-1.4.0.orig/configure.ac oprofile-1.4.0/configure.ac
--- oprofile-1.4.0.orig/configure.ac 2024-11-17 20:45:17.223265547 +0100
+++ oprofile-1.4.0/configure.ac 2024-11-17 20:52:05.146394249 +0100
@@ -118,6 +118,7 @@
#include <asm/unistd.h>
#include <sys/types.h>
#include <string.h>
+ #include <unistd.h>
]],
[[struct perf_event_attr attr;
pid_t pid;

View File

@@ -48,6 +48,7 @@ pkg_setup() {
src_prepare() {
eapply "${FILESDIR}/musl.patch"
eapply "${FILESDIR}/gcc12.patch"
eapply "${FILESDIR}/config-implicit.patch"
# bug 723092
sed -i 's/==/=/g' configure.ac || die

View File

@@ -1,3 +1,5 @@
https://gitlab.com/lvmteam/lvm2/-/merge_requests/18
From 25f0398b1c9d108160a39de43af6f2fa3f952db5 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 17 Nov 2024 10:45:29 -0500