From nobody Thu Oct 17 08:51:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XThQh2w8Dz5YkpC; Thu, 17 Oct 2024 08:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XThQh2Rf0z4Dbw; Thu, 17 Oct 2024 08:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729155100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxCZhNVYA1Bf8uSlYa5GjAOikup7MT9FjZaTUJiuzKk=; b=K+45wW8zk0SXgXthuqH96MTTc/a9+VW7ewvcMbhCosHpzoh5X4azm/ZpQEI+jyrVrXpdIS iqTnMyPYNm/7MxeMqJo0eRsZBDMqcQjQ1VnCi7H7SgrDJaE4x2PwIzgrZ7/z+aqWLEeL6A FOBhsD7q68uquwS8FWs89gQUkiNoJCNrPW7BG/elBE4h8x3zWmU5UQNCHPF88nl3LSnmNR 4SOY6wPE15Q3uvAozFVR7FFi0zzBF0OGT0X9gkxvhn9TDltfijErFIz8m0m6hll2lj2H9k T+zqcbK5jMl2sy7nFLKqsZRDoVq3q2Ww8DC/8WpE1oPIOmB3aieC1s1sYkTGCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729155100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxCZhNVYA1Bf8uSlYa5GjAOikup7MT9FjZaTUJiuzKk=; b=MMRjfw+EOvi0YWTG4LWq6trqx9ecWHc8IqxLvcvYzQaDbNWQibCXu4ZIUTnI/5IqhkgZxq AVZKyj0lyKg3NHcpoxZ053fJ351uM30aFIoFkm4BRxPShWS02oGl1+Gj66CejRjGzykLJI 9fR9MuDnMQjeRbsNOo4az6Z/eoTpEX2PRFSWUR+gogu285hd8ksGi/epjxWPLzlkzBhztL G39RDFJuh7rYwWD/BYOxSTDQMyXxSUrfChrCcunvVk7cIWSGz8fcpjF81KuMMX8ccBlMGh rg1GdHhyOP4Q5lvVA85ZshFFlh39mZbIrqeR+yIP2tx0msACV5hfB9caWE8ytA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729155100; a=rsa-sha256; cv=none; b=xe79I/quLlXQ2GVX1MAu+Q5ceuVI49yiqS0hWSfLgAq5/EkpL6ghJbCq+JkB3lzBaf8Frp b9na04xFCJCb/19fFGlHbsiyvt33k913EfFwyUyO1xnjmW4So2OoQGF8Wt5iU3WBPNOB3M ogUTn8TR96rKFHOTO+SHd8aHMs3EEIEsO6pz1UVsT00KVAFhEW1Mm77dysJHS8GzJrvVix gXd/k7Kb2qL+gfu8BC5JgpE/DLEEShdMhasMnzlP3kR8DSgOEs8P9BdoXoOa4ujAepLMgh kZlN0zTaYHDOOLj/Db8HPwrbK6K4N/EGYawElc6Oxa17fowRO4S0SkDIZfcXpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XThQh23Gmzjsv; Thu, 17 Oct 2024 08:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49H8peVP046479; Thu, 17 Oct 2024 08:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49H8peVQ046476; Thu, 17 Oct 2024 08:51:40 GMT (envelope-from git) Date: Thu, 17 Oct 2024 08:51:40 GMT Message-Id: <202410170851.49H8peVQ046476@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 0975f4146459 - main - archivers/rpm4: option and flavor to deactivate OpenMP List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0975f41464590f6cdf2203912288d1da0d979d1a Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=0975f41464590f6cdf2203912288d1da0d979d1a commit 0975f41464590f6cdf2203912288d1da0d979d1a Author: Rodrigo Osorio AuthorDate: 2024-10-16 21:24:49 +0000 Commit: Rodrigo Osorio CommitDate: 2024-10-17 08:45:59 +0000 archivers/rpm4: option and flavor to deactivate OpenMP Some users reported that OpenMP may have some strange results on openstack infrastructure. Disabling OpenMP fix the issue. PR: 282079 Reported by: Xavier Beaudouin --- archivers/rpm4/Makefile | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index f2966b5191eb..51609a558588 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,26 +24,34 @@ 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 -SHEBANG_FILES= scripts/brp-compress scripts/check-prereqs \ - scripts/check-rpaths-worker scripts/find-lang.sh \ - scripts/fontconfig.prov scripts/ocamldeps.sh scripts/perl.prov \ - scripts/perl.req scripts/pkgconfigdeps.sh \ - scripts/rpm_macros_provides.sh -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS= --enable-sqlite=yes \ - --localstatedir=/var \ - --sysconfdir=${PREFIX}/etc \ - --with-popt-prefix="${LOCALBASE}" \ - --without-javaglue \ - am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} -CONFIGURE_ENV= LUA_CFLAGS=-I${LUA_INCDIR} \ - LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" -INSTALL_TARGET= install-strip +SHEBANG_FILES= scripts/brp-compress scripts/check-prereqs \ + scripts/check-rpaths-worker \ + scripts/find-lang.sh scripts/fontconfig.prov \ + scripts/ocamldeps.sh scripts/perl.prov \ + scripts/perl.req scripts/pkgconfigdeps.sh \ + scripts/rpm_macros_provides.sh +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +CONFIGURE_ARGS= --enable-sqlite=yes \ + --localstatedir=/var \ + --sysconfdir=${PREFIX}/etc \ + --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 CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/nspr \ -I${LOCALBASE}/include/nss/nss -I${BDB_INCLUDE_DIR} \ @@ -51,7 +59,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/nspr \ LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss -L${BDB_LIB_DIR} \ -L${LUA_LIBDIR} -CONFLICTS_INSTALL= rpm2cpio # bin/rpm2cpio +CONFLICTS_INSTALL= rpm2cpio rpm4 rpm4-noopenmp BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed