From nobody Mon Jun 26 20:41:07 2023 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 4QqfrM4scfz4hhxw; Mon, 26 Jun 2023 20:41:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QqfrM4SJzz43tW; Mon, 26 Jun 2023 20:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687812067; 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=bfebntw0eX/QnmKajMnIjmxUAGSPu5D1qrQrcqr4vNI=; b=Ta2CKThk8Xp+8HFuvFsbAyVhIMioxcQkuMO5CTgzAX9wKqQ2TW6cfx0nWOyYNm0/ZBrSxG I1VGkyWShhxGpEC9D+c3WcfpONzF5nnFBI0TM9Fp5OUA3RP3A7yipgs0162sv88wIel7wV jX4ot0Lwsn//adxfzj520r6MXzyVlyBaSWx/YJoJT20rhYW06u6DgK6thjFTQPZ4oDMiZr JbI8QpHwhbh1/uj6BsAmydfn9fItzvhu8K7l167CoyKplcmTGreoF6AkO8ekSc1aAgLaQr Satouxls9PfPizM2jIu8+zSDRvOFVzOEfgBmvUmkhCOb5x2Kb8P0AukjRgiWvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687812067; 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=bfebntw0eX/QnmKajMnIjmxUAGSPu5D1qrQrcqr4vNI=; b=DV/LYHUSuz9tEcV5tADbZtN4cDkeoOiXaUO9HtNj5lUHVouMC6hVEdgO783YLaDWVWhNvN HVZbP+Oqzb5qjph+mQUOQCkCiguzSwHG1hK1tCS8WIRXvYB9Yn/lSnsLIBysF9Yr80/qqp 9jxun3313JPF8kbW5XT6k/HQRPocdMJpDv4O6pLmC3w90yIQ1Yfwhb0ioxN1RZ/dwSilLM rIbg4xzxoJuOGimBUQAn3q4Kh/cdiqF7YWl7g3HjtUxGZQHubs3LF9DQI/gDKOFGipMr6A DYQsYOzjWQjV/UcIweol1QyWBtuzWgiTfWVvIaib8aRzhI88pETpUywMiDARCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687812067; a=rsa-sha256; cv=none; b=MaZ60xaoyk3MF8n8qlLKPQJWfvse0CRwTpWOGVTAzNFxBBEi+p5hRMrsolOoUDpLvvsVD1 82Oa70KCr76nED+4hb7umZHhmBQSdT7G29Qeet90YR4vW0ZmPTyNWrxJvJ5nvhLFLwdE9p B/qNB1fKZpNhMRx9gnbz8YdUYnCpW97RWgI4nAwfHDSOs87Nev5cWr5Vi0qcxdugeWx5jL wagmC0PmEpB9KHnHvHCKu0k+dTQhdvLiRP8Dbq+6GZFOgKTxIr4DZbjjndb4wF8lGqAt3/ R08HBaa4YNHnNgjPnoAX22Vjv1+5nrWC/RTu7pfFiIXkUzbOYX0fE+dXTW2iKA== 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 4QqfrM3XtLzPkh; Mon, 26 Jun 2023 20:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QKf7ka042524; Mon, 26 Jun 2023 20:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QKf7tu042523; Mon, 26 Jun 2023 20:41:07 GMT (envelope-from git) Date: Mon, 26 Jun 2023 20:41:07 GMT Message-Id: <202306262041.35QKf7tu042523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 770f3a4edf68 - main - devel/util-linux: Unbreak on FreeBSD 13.2 and set pkgconfigdir 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 770f3a4edf68e545f9f19b2c5fc3fff58021cc40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=770f3a4edf68e545f9f19b2c5fc3fff58021cc40 commit 770f3a4edf68e545f9f19b2c5fc3fff58021cc40 Author: Daniel Engberg AuthorDate: 2023-06-26 20:28:52 +0000 Commit: Daniel Engberg CommitDate: 2023-06-26 20:28:58 +0000 devel/util-linux: Unbreak on FreeBSD 13.2 and set pkgconfigdir * Remove bswap compatibility "hacks" as we now have glibc compatible ones in supported releases * Set pkgconfigdir so .pc files ends up in correct path PR: 242996 Reviewed by: Warner Losh , yuri (maintainer) --- devel/util-linux/Makefile | 6 ++-- devel/util-linux/files/patch-include_bitops.h | 47 +++++---------------------- 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 7563d2a3e949..0a681ea14d58 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -11,21 +11,21 @@ WWW= https://github.com/karelzak/util-linux LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_14= ld: error: undefined symbol: bswap32 - LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= bash:shells/bash USES= autoreconf gettext-tools gmake libtool ncurses pkgconfig \ shebangfix tar:xz + USE_LDCONFIG= yes SHEBANG_FILES= misc-utils/getopt-parse.bash GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disable-ipcs \ - --disable-makeinstall-chown --disable-makeinstall-setuid + --disable-makeinstall-chown --disable-makeinstall-setuid \ + --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip diff --git a/devel/util-linux/files/patch-include_bitops.h b/devel/util-linux/files/patch-include_bitops.h index 063fd8d843bb..2b5c7ce9f633 100644 --- a/devel/util-linux/files/patch-include_bitops.h +++ b/devel/util-linux/files/patch-include_bitops.h @@ -1,40 +1,11 @@ -commit a38d1f69fee5ca7e883b09ed3668a7da3b161051 -Author: Warner Losh -Date: Fri Apr 29 15:29:44 2022 -0600 - - BSD: Use byteswap.h and endian.h defined macos when present - - Newer versions of FreeBSD will have a glibc compatible - byteswap.h. Currently, this file assumes that FreeBSD requires - bswap{16,32,64} to always be defined. This isn't the case when we're - using the byteswap.h file (which is enabled by HAVE_BYTESWAP_H - define). Assume that if byteswap.h and endian.h are present, then the - proper macros are defined. Otherwise, assume that sys/endian.h is - present and paper over the small differences between the BSDs for this - file. - - Signed-off-by: Warner Losh - ---- include/bitops.h +--- include/bitops.h.orig 2023-06-25 21:35:59 UTC +++ include/bitops.h -@@ -20,6 +20,12 @@ - # include - #endif - -+#if !(defined(HAVE_BYTESWAP_H) && defined(HAVE_ENDIAN_H)) -+/* -+ * When both byteswap.h and endian.h are preseent, the proper macros are defined -+ * as those files are glibc compatible. Otherwise, compensate for the slightly -+ * different interfaces between the different BSDs. -+ */ - #if defined(__OpenBSD__) - # include +@@ -25,7 +25,7 @@ # define be16toh(x) betoh16(x) -@@ -47,6 +53,7 @@ - # define bswap_32(x) OSSwapInt32(x) - # define bswap_64(x) OSSwapInt64(x) - #endif -+#endif - - /* - * Fallbacks + # define be32toh(x) betoh32(x) + # define be64toh(x) betoh64(x) +-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) ++#elif defined(__NetBSD__) || defined(__DragonFly__) + # define bswap_16(x) bswap16(x) + # define bswap_32(x) bswap32(x) + # define bswap_64(x) bswap64(x)