Attachment 254464 Details for Bug 282284 – update git-format patch

update git-format patch

0001-archivers-rpm4-Adding-noopenmp-configuration-and-fla.patch (text/plain), 1.54 KB, created by Xavier Beaudouin on 2024-10-23 13:02:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Beaudouin

Created: 2024-10-23 13:02:21 UTC

Size: 1.54 KB

patch

obsolete

>From b48d6305b9ecf837ed3bbafae1429e51a3804034 Mon Sep 17 00:00:00 2001
>From: Xavier Beaudouin <kiwi@oav.net>
>Date: Mon, 14 Oct 2024 15:59:13 +0200
>Subject: [PATCH] archivers/rpm4: Adding noopenmp configuration and flavor
>
>In some case OpenMP can cause some segmentation faults.
>This patch add a configuration knob and also a flavor to permit
>having both compiled versions.
>
>Sponsored By: Klara, Inc.
>---
> archivers/rpm4/Makefile | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
>index f2966b5191eb..354a9c491707 100644
>--- a/archivers/rpm4/Makefile
>+++ b/archivers/rpm4/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	rpm
> PORTVERSION=	4.18.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	archivers
> MASTER_SITES=	http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/
> PKGNAMESUFFIX=	4
>@@ -24,6 +24,10 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libelf.so:devel/elfutils \
> 		bash:shells/bash \
> 		gxargs:misc/findutils
> 
>+FLAVORS=	default noopenmp
>+FLAVOR?=	${FLAVORS:[1]}
>+noopenmp_PKGNAMESUFFIX=	4-noopenmp
>+
> USES=		alias bdb cpe gmake iconv libarchive libtool lua pathfix \
> 		pkgconfig readline shebangfix sqlite tar:bzip2
> USE_LDCONFIG=	yes
>@@ -41,6 +45,9 @@ CONFIGURE_ARGS=	--enable-sqlite=yes \
> 		--with-popt-prefix="${LOCALBASE}" \
> 		--without-javaglue \
> 		am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER}
>+.if ${FLAVOR} == noopenmp
>+CONFIGURE_ARGS+=	--disable-openmp
>+.endif
> CONFIGURE_ENV=	LUA_CFLAGS=-I${LUA_INCDIR} \
> 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
> INSTALL_TARGET=	install-strip
>-- 
>2.46.2
>

Actions: View

Attachments on bug 282284: 254461 | 254464 | 254465