From nobody Sun May 15 04:58:36 2022 X-Original-To: dev-commits-ports-all@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 ED5011ADE729; Sun, 15 May 2022 04:58:36 +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 4L19Bh6MDMz4mvj; Sun, 15 May 2022 04:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652590716; 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=ei4x70I6pDTyRr8UtqcwUddxlMyL0utsHmUI2SPoUNY=; b=aywXIbg4EmgVTXhWrEO1YUpiEimaOlwfEXVFrJY1J+deT0V1kIE5ImE0dYypYJFwnz6DTH WYhdi30eG24hvt+agmfQdOFFAeFpuJvK9Us+noIyXVkPOIM4rZ1cooiWDNgNIyLVpEKAgd YQKxvKQN75204mUX+KD3lio0XzteEUetudnuH1Nzgw9lazZX5LnBKxh+IjAwXNYARpRxOx N0tDfeCVSr87+dmQp4xeqbR0MAn/pQoLHosgPhRVHm90tPwpxa4OW3tzSRaZXPM5l1BpzP lqDSa9TP+pqcZA+Uevv6oOAANE0qi8cC7/QeCFumNAMl57T2WTvk5unpcLUyWA== 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 B9FE525074; Sun, 15 May 2022 04:58:36 +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 24F4wa6Z005442; Sun, 15 May 2022 04:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F4wahM005441; Sun, 15 May 2022 04:58:36 GMT (envelope-from git) Date: Sun, 15 May 2022 04:58:36 GMT Message-Id: <202205150458.24F4wahM005441@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fukang Chen Subject: git: 73f0aa653a34 - 2022Q2 - misc/mbuffer: Fix build on 12.3-RELEASE aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: loader X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 73f0aa653a348b4301e10e352c6aca7aed4853ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652590716; 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=ei4x70I6pDTyRr8UtqcwUddxlMyL0utsHmUI2SPoUNY=; b=GqNoAttPqiEP7cufph+rsJ0eQhf/qMAK2NgpqPoKoG4GvtpaRCL6GOLlicUCBo8Zyugtit FqiYJzZas2iIfZMCcw5jMH7xaVyi1aFO5roXapSeWEPsoyb5mlb/PrZbM4/U2tlWVzd1MW dfHYT9IiKGhB2xiiQXRJETv2Iyc+lLrmJXW/Up46aOfGw0JiXau1DLjsOZggJVVr0r3BhG KV6s3+0IBHAeBkkpZ3OUofNa7Bnejf8nJiB5YX48zX8YigMxgkkanKP5o/ZoG3SWZZafmg pr779k6NyPXMzXzf70a4R3ln9Pd0ZS9dnMsiVj8byeQBQ6XHRqypYRiA0T+9fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652590716; a=rsa-sha256; cv=none; b=DnEpTs9zmxXrE/M1MOtMBYVs7mN+Lhc/GbhIaiflX/Zqenc0YKUtBW9p3zvB8Xlh6GXmXe zI1XEplSP6cNTHKK5eF0hOslnGKrA8RDlZYsCWZPJI5KW93dcIH32GUprgeYYlCX6pBTlH RwP941ctnPf6NdtAzbDS1o9XE9jyOPVdDrfX2ZWn80y9M3ige1342OEwMbMiePZJ/s08PY YmRuZP29Wa4cGhp4eb1WXlfzNDyxsMaN/hb6JIDIBbDeg6nEgPFwDkMYJIqs1DP1GUETYb bxOtr2TFOO8nfdUKdVi6noT6c4ahOqXfgm5cfj0ew5kknheKq4Ml7vZckwLxeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=73f0aa653a348b4301e10e352c6aca7aed4853ee commit 73f0aa653a348b4301e10e352c6aca7aed4853ee Author: Fukang Chen AuthorDate: 2022-05-15 03:03:24 +0000 Commit: Fukang Chen CommitDate: 2022-05-15 04:57:17 +0000 misc/mbuffer: Fix build on 12.3-RELEASE aarch64 https://lists.freebsd.org/archives/freebsd-pkg-fallout/2022-May/240425.html MFH: 2022Q2 (build fix) (cherry picked from commit 766053a588ce4c29fb8d59cddcede448e5e60812) --- misc/mbuffer/Makefile | 8 ++++- misc/mbuffer/files/extra-patch-12.3 | 61 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile index 00fcb87f9c37..bd2650e2575b 100644 --- a/misc/mbuffer/Makefile +++ b/misc/mbuffer/Makefile @@ -32,6 +32,12 @@ GCRYPT_RUN_DEPENDS= libgcrypt>=1.8.4_1:security/libgcrypt MHASH_RUN_DEPENDS= mhash>=0.9.9.9_5:security/mhash RHASH_RUN_DEPENDS= rhash>=1.3.5:security/rhash +.include + +.if ${ARCH} == aarch64 && ${OSVERSION} < 1300000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-12.3 +.endif + post-patch: ${REINPLACE_CMD} \ -e 's@bash@sh@' ${WRKSRC}/Makefile.in @@ -41,4 +47,4 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/mbuffer.rc \ ${STAGEDIR}${PREFIX}/etc/mbuffer.rc.sample -.include +.include diff --git a/misc/mbuffer/files/extra-patch-12.3 b/misc/mbuffer/files/extra-patch-12.3 new file mode 100644 index 000000000000..c60d49818579 --- /dev/null +++ b/misc/mbuffer/files/extra-patch-12.3 @@ -0,0 +1,61 @@ +- cc(1) crashes with "-g" on FreeBSD 12.3-RELEASE aarch64 + + cc: error: unable to execute command: Abort trap (core dumped) + cc: error: clang frontend command failed due to signal (use -v to see invocation) + FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2) + Target: aarch64-unknown-freebsd12.3 + Thread model: posix + InstalledDir: /usr/bin + cc: note: diagnostic msg: PLEASE submit a bug report to https://bugs.freebsd.org/submit/ and include the crash backtrace, preprocessed source, and associated run script. + cc: note: diagnostic msg: + ******************** + + PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: + Preprocessed source(s) and associated run script(s) are located at: + cc: note: diagnostic msg: /tmp/idev-47a323.c + cc: note: diagnostic msg: /tmp/idev-47a323.sh + cc: note: diagnostic msg: + + ******************** + gmake[1]: *** [Makefile:197: idev.so] Error 254 + gmake[1]: Leaving directory '/usr/ports/misc/mbuffer/work/mbuffer-20211018' + +- llvm-objdump(1) does not support "-T" on FreeBSD 12.3-RELEASE aarch64 + +--- Makefile.in.orig 2022-05-14 11:38:27 UTC ++++ Makefile.in +@@ -194,7 +194,7 @@ tapetest.so: tapetest.c config.h + $(CC) $(CFLAGS) -shared -fPIC tapetest.c -o $@ $(LIBS) + + idev.so: idev.c config.h +- $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS) ++ $(CC) $(CFLAGS) -shared -fPIC idev.c -o $@ $(LIBS) + + $(DEPS): | build + +--- configure.in.orig 2022-05-14 11:37:04 UTC ++++ configure.in +@@ -173,19 +173,19 @@ else + ]])],[ + AC_MSG_RESULT([OK]) + AC_MSG_CHECKING([name of open() in C library]) +- libc_open=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'` ++ libc_open=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'` + AC_DEFINE_UNQUOTED([LIBC_OPEN], $libc_open, [name of open() in libc]) + AC_MSG_RESULT($libc_open) + AC_MSG_CHECKING([name of read() in C library]) +- libc_read=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'` ++ libc_read=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'` + AC_DEFINE_UNQUOTED([LIBC_READ], $libc_read, [name of write() in libc]) + AC_MSG_RESULT($libc_read) + AC_MSG_CHECKING([name of write() in C library]) +- libc_write=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'` ++ libc_write=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'` + AC_DEFINE_UNQUOTED([LIBC_WRITE], $libc_write, [name of write() in libc]) + AC_MSG_RESULT($libc_write) + AC_MSG_CHECKING([name of fstat() in C library]) +- libc_fstat=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^_*fstat/ { print $NF }'` ++ libc_fstat=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^_*fstat/ { print $NF }'` + AC_DEFINE_UNQUOTED([LIBC_FSTAT], $libc_fstat, [name of fstat() in libc]) + AC_MSG_RESULT($libc_fstat) + ],