Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Oct 2019 22:20:03 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513790 - head/multimedia/totem
Message-ID:  <201910042220.x94MK3P2082483@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Oct  4 22:20:03 2019
New Revision: 513790
URL: https://svnweb.freebsd.org/changeset/ports/513790

Log:
  Prepare for powerpc-on-clang by deleting hard-coded tests for libstdc++.so
  as a stand-in for "are we running on gcc".
  
  For people already testing powerpc on clang, it is possible that they
  already have both compilers in base.  Thus, the assumption that "gcc is
  in base" (e.g.  libstdc++.so exists) always means "force use of GCC" is
  already broken.  It will be for everyone on -CURRENT once the switch is
  made.
  
  Tested on both amd64 and powerpc64.
  
  PR:		239152
  Approved by:	gnome (maintainer-timeout > 1 month)

Modified:
  head/multimedia/totem/Makefile

Modified: head/multimedia/totem/Makefile
==============================================================================
--- head/multimedia/totem/Makefile	Fri Oct  4 22:15:35 2019	(r513789)
+++ head/multimedia/totem/Makefile	Fri Oct  4 22:20:03 2019	(r513790)
@@ -37,7 +37,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gl gnome localbase meson \
+USES=		compiler desktop-file-utils gettext gl gnome localbase meson \
 		pkgconfig python:3.4+ tar:xz
 USE_GNOME=	cairo gtk30 intlhack introspection libxml2 nautilus3 \
 		pygobject3
@@ -76,10 +76,12 @@ pre-everything::
 	@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
 
-.if exists(/usr/lib/libstdc++.so)
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/-Wno-unused-but-set-variable/d' \
 		${WRKSRC}/src/plugins/meson.build
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910042220.x94MK3P2082483>