Index: head/cad/ghdl/Makefile =================================================================== --- head/cad/ghdl/Makefile (revision 403148) +++ head/cad/ghdl/Makefile (revision 403149) @@ -1,162 +1,158 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= ghdl -PORTVERSION= 0.32 -PORTREVISION= 2 +PORTVERSION= 0.33 +DISTVERSIONPREFIX= v CATEGORIES= cad DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= marino@FreeBSD.org COMMENT= GNU VHDL simulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libmpfr.so:${PORTSDIR}/math/mpfr \ libmpc.so:${PORTSDIR}/math/mpc USES= ada gmake USE_GITHUB= yes -GH_ACCOUNT= hanzer -GH_PROJECT= gVHDL -GH_TAGNAME= 5adb2f6 +GH_ACCOUNT= tgingold +GH_PROJECT= ghdl GNU_CONFIGURE= yes GCCVER= 4.9.2 LLVMVER= 35 BLD_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL:R} BUILDDIR= ${WRKDIR}/build GCCSRCDIR= ${WRKDIR}/gcc-${GCCVER} CFG_SCRIPT= ${GCCSRCDIR}/configure PKG_PREFIX= ${PREFIX}/ghdl -LINKER_COMMAND= ${LOCALBASE}/gcc-aux/bin/gcc +LINKER_COMMAND= ${LOCALBASE}/${ADAXX}-aux/bin/gcc GHDL_ARGS= --enable-languages="c,vhdl" \ --build=${BLD_TARGET} \ --prefix=${PKG_PREFIX:Q} \ --disable-bootstrap \ --disable-nls \ --disable-libquadmath \ --disable-libmudflap \ --disable-libgomp \ --disable-libssp \ --with-system-zlib \ --with-gmp=${PREFIX} \ --with-mpfr=${PREFIX} \ --with-mpc=${PREFIX} \ --enable-shared \ --enable-threads=posix \ ${ICONV_CONFIGURE_ARG} ${EXTRA_CONFIG} OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= GCC LLVM GCC_DESC= Code generator is GCC (mature) LLVM_DESC= Code generator is LLVM (experimental) .if exists (/sbin/hammer) OPTIONS_DEFAULT= LLVM PLIST_SUB= DRAGONFLY="" FREEBSD="@comment " .else OPTIONS_DEFAULT= GCC PLIST_SUB= DRAGONFLY="@comment " FREEBSD="" .endif .include .if ${OPSYS} == FreeBSD MODERN_BINUTILS= yes -. if ${OSREL:R} == 8 && ${ARCH} == i386 -BROKEN= get_pc_thunk.cx errors -. endif .endif .if ${ARCH:S/amd64/x86_64/} == x86_64 PLIST_SUB+= X86_64="" .else PLIST_SUB+= X86_64="@comment " .endif .if defined(MODERN_BINUTILS) # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly USE_BINUTILS= yes RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils AS_COMMAND= ${LOCALBASE}/bin/as EXTRA_CONFIG+= --with-ld=${LOCALBASE}/bin/ld .else AS_COMMAND= /usr/bin/as EXTRA_CONFIG+= --with-ld=/usr/bin/ld .endif EXTRA_CONFIG+= --with-as=${AS_COMMAND} .if ${PORT_OPTIONS:MGCC} DISTFILES+= gcc-${GCCVER}.tar.bz2 USES+= iconv libtool makeinfo perl5 USE_PERL5= build INFO= ghdl PLIST_SUB+= GLEX=ghdl/libexec/gcc/${BLD_TARGET}/${GCCVER} \ GLIB=ghdl/lib/gcc/${BLD_TARGET}/${GCCVER} \ TARGET=${BLD_TARGET} . if ${OPSYS} == DragonFly -IGNORE= Not supported by GCC backend +IGNORE= not supported by GCC backend . endif .endif .if ${PORT_OPTIONS:MLLVM} BUILD_DEPENDS+= llvm-config${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \ clang++${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} RUN_DEPENDS+= llc${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} PLIST= ${.CURDIR}/llvm-plist PLIST_SUB+= GLIB=ghdl/lib/ghdl/ .endif post-patch: @${REINPLACE_CMD} \ -e 's|\@AS_COMMAND\@|${AS_COMMAND}|' \ -e 's|\@LINKER_COMMAND\@|${LINKER_COMMAND}|' \ ${WRKSRC}/src/ghdldrv/ghdldrv.adb @${REINPLACE_CMD} \ -e 's|llvm-config|llvm-config${LLVMVER}|' \ -e 's|(INSTALL_PROGRAM)|(BSD_INSTALL_PROGRAM)|' \ -e 's|(INSTALL_DATA)|(BSD_INSTALL_DATA)|' \ ${WRKSRC}/configure ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|clang++|clang++${LLVMVER}|' \ ${WRKSRC}/src/ortho/llvm/Makefile .if ${PORT_OPTIONS:MGCC} do-configure: ${MKDIR} ${BUILDDIR} (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --with-gcc=${GCCSRCDIR} --prefix=${PKG_PREFIX:Q}) ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} copy-sources (cd ${BUILDDIR} && ${SETENV} ${CONFIGURE_ENV} \ ${CFG_SCRIPT} ${GHDL_ARGS}) do-build: (cd ${BUILDDIR} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} all) do-install: (cd ${BUILDDIR} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} install-strip ${MAKE_ARGS}) ${MV} ${STAGEDIR}${PREFIX}/ghdl/share/man/man1/ghdl.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${MV} ${STAGEDIR}${PREFIX}/ghdl/share/info/ghdl.info \ ${STAGEDIR}${PREFIX}/info ${RM} -r ${STAGEDIR}${PREFIX}/ghdl/share .endif # TAIL: GCC .if ${PORT_OPTIONS:MLLVM} do-configure: (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --with-llvm=${LOCALBASE} --prefix=${PKG_PREFIX:Q}) .endif # TAIL: LLVM check: (cd ${WRKSRC}/testsuite && ${SETENV} ${MAKE_ENV} \ GHDL=${STAGEDIR}${PREFIX}/ghdl/bin/ghdl ${SH} testsuite.sh) .include Index: head/cad/ghdl/distinfo =================================================================== --- head/cad/ghdl/distinfo (revision 403148) +++ head/cad/ghdl/distinfo (revision 403149) @@ -1,4 +1,4 @@ -SHA256 (hanzer-gVHDL-0.32-5adb2f6_GH0.tar.gz) = 49ff21abe8f5a1d8b1fc2b874c7ff78287dd8fcab3a6fff184c96c1456e4ee3d -SIZE (hanzer-gVHDL-0.32-5adb2f6_GH0.tar.gz) = 3089398 +SHA256 (tgingold-ghdl-v0.33_GH0.tar.gz) = aa1519e72e4537e69cefd18a212221a77ecac021f935b1c969532dfa3c7edb27 +SIZE (tgingold-ghdl-v0.33_GH0.tar.gz) = 3202198 SHA256 (gcc-4.9.2.tar.bz2) = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SIZE (gcc-4.9.2.tar.bz2) = 89939747 Index: head/cad/ghdl/files/patch-src_grt_Makefile.inc =================================================================== --- head/cad/ghdl/files/patch-src_grt_Makefile.inc (revision 403148) +++ head/cad/ghdl/files/patch-src_grt_Makefile.inc (nonexistent) @@ -1,14 +0,0 @@ ---- src/grt/Makefile.inc.orig 2015-06-01 05:56:40 UTC -+++ src/grt/Makefile.inc -@@ -71,6 +71,11 @@ ifeq ($(filter-out x86_64 freebsd%,$(arc - GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS) - ADAC=ada - endif -+ifeq ($(filter-out x86_64 dragonfly%,$(arch) $(osys)),) -+ GRT_TARGET_OBJS=amd64.o linux.o times.o -+ GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS) -+ ADAC=ada -+endif - ifeq ($(filter-out i%86 darwin%,$(arch) $(osys)),) - GRT_TARGET_OBJS=i386.o linux.o times.o - GRT_EXTRA_LIB= Property changes on: head/cad/ghdl/files/patch-src_grt_Makefile.inc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb =================================================================== --- head/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb (revision 403148) +++ head/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb (revision 403149) @@ -1,31 +1,24 @@ ---- src/ghdldrv/ghdldrv.adb.orig 2015-05-30 07:12:42 UTC +--- src/ghdldrv/ghdldrv.adb.orig 2015-10-23 05:51:44 UTC +++ src/ghdldrv/ghdldrv.adb -@@ -43,8 +43,8 @@ package body Ghdldrv is +@@ -42,8 +42,8 @@ package body Ghdldrv is -- Name of the tools used. Compiler_Cmd : String_Access := null; Post_Processor_Cmd : String_Access := null; - Assembler_Cmd : constant String := "as"; - Linker_Cmd : constant String := "gcc"; + Assembler_Cmd : aliased String := "@AS_COMMAND@"; + Linker_Cmd : aliased String := "@LINKER_COMMAND@"; -- Path of the tools. Compiler_Path : String_Access; -@@ -467,15 +467,9 @@ package body Ghdldrv is - end if; - end if; - if Compile_Kind >= Compile_Gcc then -- Assembler_Path := Locate_Exec_On_Path (Assembler_Cmd); -- if Assembler_Path = null and not Flag_Asm then -- Tool_Not_Found (Assembler_Cmd); -- end if; -- end if; -- Linker_Path := Locate_Exec_On_Path (Linker_Cmd); -- if Linker_Path = null then +@@ -502,8 +502,9 @@ package body Ghdldrv is + -- Linker. + Linker_Path := Locate_Exec_On_Path (Linker_Cmd); + if Linker_Path = null then - Tool_Not_Found (Linker_Cmd); + Assembler_Path := Assembler_Cmd'Access; end if; + Linker_Path := Linker_Cmd'Access; end Locate_Tools; procedure Setup_Compiler (Load : Boolean)