From owner-svn-ports-head@freebsd.org Fri Nov 29 15:02:15 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AABCD1B2EA7; Fri, 29 Nov 2019 15:02:15 +0000 (UTC) (envelope-from pkubaj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Pd5g3vv6z40xN; Fri, 29 Nov 2019 15:02:15 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AFDFFE63; Fri, 29 Nov 2019 15:02:15 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xATF2Ffh022440; Fri, 29 Nov 2019 15:02:15 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xATF2E5L022436; Fri, 29 Nov 2019 15:02:14 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201911291502.xATF2E5L022436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 29 Nov 2019 15:02:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518658 - in head/Mk: . Uses X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/Mk: . Uses X-SVN-Commit-Revision: 518658 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2019 15:02:15 -0000 Author: pkubaj Date: Fri Nov 29 15:02:14 2019 New Revision: 518658 URL: https://svnweb.freebsd.org/changeset/ports/518658 Log: Mk/bsd.port.mk: detect powerpc64 abi We'll have a new abi on ppc64 soon (ELFv2) which is incompatible with the ELFv1 abi. We need to detect the abi on which we build stuff. Submitted by: mikael_urankar@gmail.com Approved by: portmgr (earlier version) Differential Revision: https://reviews.freebsd.org/D22039 Modified: head/Mk/Uses/cargo.mk head/Mk/Uses/php.mk head/Mk/Uses/qt-dist.mk head/Mk/bsd.gecko.mk head/Mk/bsd.port.mk Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Fri Nov 29 14:44:18 2019 (r518657) +++ head/Mk/Uses/cargo.mk Fri Nov 29 15:02:14 2019 (r518658) @@ -74,7 +74,7 @@ RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} .endif -.if ${ARCH} == powerpc64 +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 USE_GCC?= yes .endif Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Fri Nov 29 14:44:18 2019 (r518657) +++ head/Mk/Uses/php.mk Fri Nov 29 15:02:14 2019 (r518658) @@ -159,7 +159,7 @@ FLAVOR= ${FLAVORS:[1]} . endif . endif -.if ${PHP_VER} == 74 && (${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64) +.if ${PHP_VER} == 74 && (${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64) USE_GCC= yes .endif Modified: head/Mk/Uses/qt-dist.mk ============================================================================== --- head/Mk/Uses/qt-dist.mk Fri Nov 29 14:44:18 2019 (r518657) +++ head/Mk/Uses/qt-dist.mk Fri Nov 29 15:02:14 2019 (r518658) @@ -171,7 +171,7 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/f ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf -. if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 +. if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64 _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Fri Nov 29 14:44:18 2019 (r518657) +++ head/Mk/bsd.gecko.mk Fri Nov 29 15:02:14 2019 (r518658) @@ -321,7 +321,6 @@ LDFLAGS+= -B${LOCALBASE}/bin .elif ${ARCH:Mpowerpc*} . if ${ARCH} == "powerpc64" MOZ_EXPORT+= UNAME_m="${ARCH}" -CFLAGS+= -mminimal-toc . endif .elif ${ARCH} == "sparc64" # Work around miscompilation/mislinkage of the sCanonicalVTable hacks. Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Nov 29 14:44:18 2019 (r518657) +++ head/Mk/bsd.port.mk Fri Nov 29 15:02:14 2019 (r518658) @@ -1126,6 +1126,16 @@ ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,} .endif _EXPORTED_VARS+= ARCH +.if ${ARCH} == powerpc64 +. if !defined(PPC_ABI) +PPC_ABI!= ${CC} -dM -E - < /dev/null | ${AWK} '/_CALL_ELF/{print "ELFv"$$3}' +. if ${PPC_ABI} != ELFv2 +PPC_ABI= ELFv1 +. endif +. endif +_EXPORTED_VARS+= PPC_ABI +.endif + # Get operating system versions for a cross build .if defined(CROSS_SYSROOT) .if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h)