Fix the build on i386 by adding -march=i486 to CFLAGS to gcc exports the

proper atomic symbols.

Fix the build on 6.x with USE_GCC=4.2+.

Simplify the Makefile a bit with USE_CMAKE.

Remove a bogus file that crept in to the initial install.

2 files changed, 9 insertions, 61 deletions

diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
index 89aa0b413687..9f597dd1cb96 100644
--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@@ -16,13 +16,14 @@ COMMENT=	Compiler runtime library with Blocks support
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
-BROKEN=		does not build
-
 CONFIGURE_WRKSRC=	${WRKDIR}/build
 BUILD_WRKSRC=		${WRKDIR}/build
 INSTALL_WRKSRC=		${WRKDIR}/build
 
-#USE_GCC=	4.2+
+CMAKE_SOURCE_PATH=	${WRKSRC}
+
+USE_CMAKE=	yes
+USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -36,6 +37,10 @@ PLIST_FILES=	include/Block.h \
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386"
+CFLAGS+=	-march=i486
+.endif
+
 .if defined(BOOTSTRAP)
 SVN_REV!=	svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2
 .else
@@ -58,9 +63,7 @@ ${DISTNAME}
 .endif
 .endif
 
-do-configure:
+post-extract:
 	${MKDIR} ${CONFIGURE_WRKSRC}
-	cd ${CONFIGURE_WRKSRC} && \
-	    cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" ${WRKSRC}
 
 .include <bsd.port.post.mk>
diff --git a/devel/compiler-rt/foo b/devel/compiler-rt/foo
deleted file mode 100644
index 1b0d88c59f38..000000000000
--- a/devel/compiler-rt/foo
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:    compiler-rt
-# Date created:	 20 Nov 2005
-#
-# $FreeBSD$	     
-#
-
-PORTNAME=       compiler-rt
-DISTVERSION=    0.r${SVN_REV}
-CATEGORIES=     devel 
-MASTER_SITES=   ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=     brooks
-	    
-MAINTAINER=     brooks@FreeBSD.org
-COMMENT=	Low Level Virtual Machine
-
-CONFIGURE_WRKSRC=	${WRKDIR}/build
-BUILD_WRKSRC=		${WRKDIR}/build
-
-USE_GCC=	4.2+
-USE_GMAKE=      yes
-USE_BZIP2=      yes
-USE_LDCONFIG=   yes
-MAKE_JOBS_SAFE= yes
-
-LLVM_SVN=       http://llvm.org/svn/llvm-project
-
-MAN1=
-
-.include <bsd.port.pre.mk>
-
-.if defined(BOOTSTRAP)
-SVN_REV!=       svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2
-.else
-.include "Makefile.svn_rev"
-.endif
-
-.if defined(BOOTSTRAP)
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
-
-do-fetch:
-	${MKDIR} ${WRKDIR}
-	svn export -r ${SVN_REV} \
-	    ${LLVM_SVN}/compiler-rt/trunk ${WRKSRC}
-	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2
-${DISTNAME}
-	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
-.if ${USER} == brooks
-	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    freefall.freebsd.org:public_distfiles/
-.endif
-.endif
-
-do-configure:
-	${MKDIR} ${CONFIGURE_WRKSRC}
-	cd ${CONFIGURE_WRKSRC}/build && cmake ../compiler-rt