svn commit: r392768 - in head/lang/tcc: . files

[Kurt Jaeger]

Author: pi
Date: Fri Jul 24 04:28:40 2015
New Revision: 392768
URL: https://svnweb.freebsd.org/changeset/ports/392768

Log:
  lang/tcc: add amd64 support
  
  - Add amd64 support
  - Fix shebang in texi2pod.pl
  - Fix pkg-plist
  - Bump PORTVERSION
  
  PR:		201749
  Submitted by:	Carlos Jacobo Puga Medina <cpm at fbsd.es> (maintainer)

Added:
  head/lang/tcc/files/
  head/lang/tcc/files/patch-lib_Makefile   (contents, props changed)
  head/lang/tcc/files/patch-texi2pod.pl   (contents, props changed)
Modified:
  head/lang/tcc/Makefile
  head/lang/tcc/pkg-plist

Modified: head/lang/tcc/Makefile
==============================================================================
--- head/lang/tcc/Makefile	Fri Jul 24 03:31:33 2015	(r392767)
+++ head/lang/tcc/Makefile	Fri Jul 24 04:28:40 2015	(r392768)
@@ -2,7 +2,7 @@
 
 PORTNAME=	tcc
 PORTVERSION=	0.9.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	SAVANNAH/tinycc
 
@@ -11,7 +11,7 @@ COMMENT=	Tiny C Compiler
 
 LICENSE=	LGPL21
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	amd64 i386
 
 CONFLICTS=	TenDRA-[0-9]*
 
@@ -28,7 +28,21 @@ PORTDOCS=	COPYING	Changelog README TODO 
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+=	--cpu=x86-64 --extra-cflags="-DTCC_TARGET_X86_64 -DONE_SOURCE"
+MAKE_ARGS+=	ARCH=x86-64
+CPUTYPE=	x86_64
+FILES=	bcheck.o alloca86_64.o libtcc1.o
+
+PLIST_SUB+=	AMD64=""
+.else
+PLIST_SUB+=	AMD64="@comment "
+.endif
+
 .if ${ARCH} == "i386"
+CPUTYPE=	i386
+FILES=	bcheck.o alloca86.o alloca86-bt.o
+
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
@@ -42,7 +56,9 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tcc
 	${INSTALL_MAN} ${WRKSRC}/tcc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${RM} -r ${STAGEDIR}${PREFIX}/share/man
-	${INSTALL_DATA} ${WRKSRC}/lib/i386/bcheck.o ${STAGEDIR}${PREFIX}/lib/tcc
+.for f in ${FILES}
+	${INSTALL_DATA} ${WRKSRC}/lib/${CPUTYPE}/*.o ${STAGEDIR}${PREFIX}/lib/tcc
+.endfor
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Added: head/lang/tcc/files/patch-lib_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/tcc/files/patch-lib_Makefile	Fri Jul 24 04:28:40 2015	(r392768)
@@ -0,0 +1,11 @@
+--- lib/Makefile.orig	2015-07-21 22:05:25 UTC
++++ lib/Makefile
+@@ -40,7 +40,7 @@ native : TCC = $(TOP)/tcc$(EXESUF)
+ cross : TCC = $(TOP)/$(TARGET)-tcc$(EXESUF)
+ 
+ I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O)
+-X86_64_O = libtcc1.o alloca86_64.o
++X86_64_O = libtcc1.o alloca86_64.o $(BCHECK_O)
+ WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
+ WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
+ 

Added: head/lang/tcc/files/patch-texi2pod.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/tcc/files/patch-texi2pod.pl	Fri Jul 24 04:28:40 2015	(r392768)
@@ -0,0 +1,8 @@
+--- texi2pod.pl.orig	2013-02-15 14:24:00 UTC
++++ texi2pod.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#! /usr/local/bin/perl -w
+ 
+ #   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ 

Modified: head/lang/tcc/pkg-plist
==============================================================================
--- head/lang/tcc/pkg-plist	Fri Jul 24 03:31:33 2015	(r392767)
+++ head/lang/tcc/pkg-plist	Fri Jul 24 04:28:40 2015	(r392768)
@@ -8,6 +8,10 @@ lib/tcc/include/stddef.h
 lib/tcc/include/tcclib.h
 lib/tcc/include/varargs.h
 lib/tcc/bcheck.o
+%%I386%%lib/tcc/alloca86.o
+%%I386%%lib/tcc/alloca86-bt.o
+%%AMD64%%lib/tcc/alloca86_64.o
+lib/tcc/libtcc1.o
 lib/tcc/libtcc1.a
 man/man1/tcc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/tcc-doc.html