Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Mar 2014 00:03:40 +0000 (UTC)
From:      Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348908 - head/emulators/mupen64plus-core
Message-ID:  <201403240003.s2O03eNl072316@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: acm
Date: Mon Mar 24 00:03:39 2014
New Revision: 348908
URL: http://svnweb.freebsd.org/changeset/ports/348908
QAT: https://qat.redports.org/buildarchive/r348908/

Log:
  - Fix build with clang
  
  Reported by: pkg-fallout

Modified:
  head/emulators/mupen64plus-core/Makefile
  head/emulators/mupen64plus-core/Makefile.common

Modified: head/emulators/mupen64plus-core/Makefile
==============================================================================
--- head/emulators/mupen64plus-core/Makefile	Sun Mar 23 23:55:27 2014	(r348907)
+++ head/emulators/mupen64plus-core/Makefile	Mon Mar 24 00:03:39 2014	(r348908)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	2.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \

Modified: head/emulators/mupen64plus-core/Makefile.common
==============================================================================
--- head/emulators/mupen64plus-core/Makefile.common	Sun Mar 23 23:55:27 2014	(r348907)
+++ head/emulators/mupen64plus-core/Makefile.common	Mon Mar 24 00:03:39 2014	(r348908)
@@ -29,11 +29,19 @@ LIB_DEPENDS+=		libboost_thread.so:${PORT
 
 .if ${PKGNAMESUFFIX} != "-core"
 post-patch:
+	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
+		's|g++|${CXX}|g' Makefile
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
 		@cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \
 			${REINPLACE_CMD} -e 's|#include <thread>||g' \
 				GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp
 .	endif
+.	if ${PKGNAMESUFFIX} == "-video-glide64"
+                @cd ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/src && \
+                        ${REINPLACE_CMD} -e 's|__builtin_ia32_loadups|_mm_loadu_ps|g' -e \
+				's|__builtin_ia32_storeups|_mm_storeu_ps|g' \
+					3dmath.cpp
+.	endif
 
 pre-install:
 	@${RM} -f ${PLIST}
@@ -60,6 +68,9 @@ pre-install:
 .	else
 		@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
 .	endif
+.else
+	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
+		's|g++|${CXX}|g' Makefile
 .endif
 
 do-install:



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