From nobody Thu Aug 25 21:35:24 2022 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 4MDGTm4Yy4z4ZZCt; Thu, 25 Aug 2022 21:35:24 +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 4MDGTm48Wwz3qgQ; Thu, 25 Aug 2022 21:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463324; 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=iMsezWpKWSSkUrP7vzn830O44s5YxKXNIb1qrS7S4So=; b=b/RrdgSAyLmDLdHgxVkdiBBEfIiTqC3YE9QBZaWYZiTXmllvadOkTyK+gf732grJDPdCI2 lwo49dWzEGUqJ344gz0YADZDwywYHG4rChSn9ochg7tH+0j5tLKiH7ylDBUaFk4cBJY6Ku nxwU8r0rgdOmwYBSwQIkuz4/Ew2KJKRTHhW530QEM8IsuAjrSET/Y8vr35VHjML3tuoFaw usBMvQBct+EQrU+ACr0KGLJ4QP9cXL9su73AUhRxxmxr8xZnMAoH90zGk6beBxTjo9FTGI KLXAs24Pjcrkg/gaIEveeU9QoVN2eygQvvQB8ZvV9SZN6y0yIbyIaxoaR5oywQ== 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 4MDGTm3GcXz137w; Thu, 25 Aug 2022 21:35:24 +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 27PLZOHe085406; Thu, 25 Aug 2022 21:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLZOu3085405; Thu, 25 Aug 2022 21:35:24 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:35:24 GMT Message-Id: <202208252135.27PLZOu3085405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: ebfe943ce41f - main - devel/freebsd-sysroot: Try to fix powerpc64_elfv1 flavor 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebfe943ce41f5a5fb8016ae3f9fc75c214b8d2cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661463324; 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=iMsezWpKWSSkUrP7vzn830O44s5YxKXNIb1qrS7S4So=; b=JgtK2w+LYmUTLrpYc9D84h598fEg2mczJneytXm1E/wrUT6KSXD89qoFEhct90K6k7id3Q +sD0Zw7AkzuwRwA5CRLRa5ygG1usCa18PgAz5fpcc8nWgi/LgyyVz07xVIGiOl6lr5+B6D yrggtf2ksnQ34f77iQ/lUlZNosAI4iqa3Umeabg+gC7nDpYXFnWBgPZjBtGzILijloEwCz 4WoZOekI07aCZ9+cZXwvEnfCXqk13MUrkgbjSDtQnYXIWnekobQiBxR/stG5TmULKMl7gW ZTxZcNlAnLLOivWp2HybNwte1nKA9yEuzaKP0+hcCYQcPxwrxpx9ljfwAsIGnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661463324; a=rsa-sha256; cv=none; b=POjv9FmK4gUYTQz9Kx0ueAU7bZ/bTYY72dREjrJGa0fu2i9ROXvS8QEzvPm79xm7noMYPB wdW5kpCnVazCFpR5iaePkwJNnkqxLFfUzVAUumTAeF+c4yWtXizvkUvaAWprvudTHsGfux H+lvgJDcz3zQgJJ1X+trjfr6+S/GEGwmrbQhQdipmo8HbUcbJCGNgxPtK7bY2WqrwQxTR2 oEVJCm6vsKICTt35+ZursJny2XFnKrQ/7EzwxJmBMEacZthN83VxsUbJb8mAFj/4/Tjpnx fNJ6I1Hh+yoZkF+avtT5xq5gBrIaob+eTUQzTJKwSD11lXzWyC7UDza97cgrAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebfe943ce41f5a5fb8016ae3f9fc75c214b8d2cb commit ebfe943ce41f5a5fb8016ae3f9fc75c214b8d2cb Author: Tobias Kortkamp AuthorDate: 2022-08-25 21:16:22 +0000 Commit: Tobias Kortkamp CommitDate: 2022-08-25 21:16:22 +0000 devel/freebsd-sysroot: Try to fix powerpc64_elfv1 flavor The freebsd-gcc9 default ABI switch to elfv2 in bf742277557cd64e9017df3844ca82173529c1ae breaks it: /usr/local/bin/powerpc64-unknown-freebsd13.0-ld: /tmp//ccNlmC42.o: ABI version 2 is not compatible with ABI version 1 output /usr/local/bin/powerpc64-unknown-freebsd13.0-ld: failed to merge target specific data of file /tmp//ccNlmC42.o --- devel/freebsd-sysroot/files/powerpc64_elfv1-c++.in | 2 +- devel/freebsd-sysroot/files/powerpc64_elfv1-cc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/freebsd-sysroot/files/powerpc64_elfv1-c++.in b/devel/freebsd-sysroot/files/powerpc64_elfv1-c++.in index 293a20c2f59e..2cb877d1c80c 100644 --- a/devel/freebsd-sysroot/files/powerpc64_elfv1-c++.in +++ b/devel/freebsd-sysroot/files/powerpc64_elfv1-c++.in @@ -1,4 +1,4 @@ #!/bin/sh : ${FREEBSD_SYSROOT_CXX:="%%FREEBSD_SYSROOT_CXX_ELFV1%%"} : ${FREEBSD_SYSROOT:="%%FREEBSD_SYSROOT%%"} -exec "${FREEBSD_SYSROOT_CXX}" --sysroot="${FREEBSD_SYSROOT}" -Wl,-rpath=/usr/local/lib/gcc9 -L"${FREEBSD_SYSROOT}/usr/local/lib/gcc9" -isystem="%%LOCALBASE%%/lib/gcc9/include/c++" -isystem="%%FREEBSD_SYSROOT_CXXINC_ELFV1%%" "$@" +exec "${FREEBSD_SYSROOT_CXX}" -mabi=elfv1 --sysroot="${FREEBSD_SYSROOT}" -Wl,-rpath=/usr/local/lib/gcc9 -L"${FREEBSD_SYSROOT}/usr/local/lib/gcc9" -isystem="%%LOCALBASE%%/lib/gcc9/include/c++" -isystem="%%FREEBSD_SYSROOT_CXXINC_ELFV1%%" "$@" diff --git a/devel/freebsd-sysroot/files/powerpc64_elfv1-cc.in b/devel/freebsd-sysroot/files/powerpc64_elfv1-cc.in index c7f09d85afba..2a6535da0cd0 100644 --- a/devel/freebsd-sysroot/files/powerpc64_elfv1-cc.in +++ b/devel/freebsd-sysroot/files/powerpc64_elfv1-cc.in @@ -1,4 +1,4 @@ #!/bin/sh : ${FREEBSD_SYSROOT_CC:="%%FREEBSD_SYSROOT_CC_ELFV1%%"} : ${FREEBSD_SYSROOT:="%%FREEBSD_SYSROOT%%"} -exec "${FREEBSD_SYSROOT_CC}" --sysroot="${FREEBSD_SYSROOT}" -Wl,-rpath=/usr/local/lib/gcc9 -L"${FREEBSD_SYSROOT}/usr/local/lib/gcc9" "$@" +exec "${FREEBSD_SYSROOT_CC}" -mabi=elfv1 --sysroot="${FREEBSD_SYSROOT}" -Wl,-rpath=/usr/local/lib/gcc9 -L"${FREEBSD_SYSROOT}/usr/local/lib/gcc9" "$@"