Date: Thu, 1 Aug 2019 18:58:14 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507820 - in head/lang/ghc: . files Message-ID: <201908011858.x71IwEwA000913@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Thu Aug 1 18:58:14 2019 New Revision: 507820 URL: https://svnweb.freebsd.org/changeset/ports/507820 Log: lang/ghc: fix build on powerpc64 elfv1 Dtrace doesn't seem to work on elfv1 powerpc64 (at least on 12.0-RELEASE). Also properly detect when running on elfv1 and elfv2. PR: 239193 Approved by: arrowd (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D20995 Modified: head/lang/ghc/Makefile head/lang/ghc/files/patch-ppc64 Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Thu Aug 1 18:56:20 2019 (r507819) +++ head/lang/ghc/Makefile Thu Aug 1 18:58:14 2019 (r507820) @@ -95,6 +95,10 @@ CONFIGURE_ARGS+= --enable-dtrace=0 LLVM_VERSION= 60 .endif +.if ${ARCH} == powerpc64 +CONFIGURE_ARGS+= --enable-dtrace=0 +.endif + .if ${ARCH} == amd64 || ${ARCH} == i386 BOOT_GHC_VERSION= 8.4.3 .else Modified: head/lang/ghc/files/patch-ppc64 ============================================================================== --- head/lang/ghc/files/patch-ppc64 Thu Aug 1 18:56:20 2019 (r507819) +++ head/lang/ghc/files/patch-ppc64 Thu Aug 1 18:58:14 2019 (r507820) @@ -411,7 +411,7 @@ index 2f64d82ee5..82726d90d9 100644 -------------------------------------------------------------------------- */ -#if defined(powerpc64_HOST_ARCH) -+#if defined(ELF_V1) ++#if defined(_CALL_ELF) && (_CALL_ELF == 1) -#if defined(linux_HOST_OS) static void GNUC3_ATTRIBUTE(used) @@ -428,7 +428,7 @@ index 2f64d82ee5..82726d90d9 100644 -#endif - -#if defined(powerpc64le_HOST_ARCH) -+#if defined(ELF_V2) ++#if defined(_CALL_ELF) && (_CALL_ELF == 2) /* ----------------------------------------------------------------------------- PowerPC 64 little endian architecture
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908011858.x71IwEwA000913>