From owner-svn-ports-all@freebsd.org Sat Nov 17 18:35:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 444FF11016AE; Sat, 17 Nov 2018 18:35:26 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 783657815D; Sat, 17 Nov 2018 18:35:25 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-lf1-f41.google.com with SMTP id p17so18649999lfh.4; Sat, 17 Nov 2018 10:35:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:content-transfer-encoding; bh=ymu5I4ATEp/8SAvZ7/EQyIcCM9OrDM0RSFF9fA8Is5g=; b=Y69OpB487JA0GcTQzr1qcJgzurqk7InG503nbDriUMKFAF1EALAPS/XRxDqmGhtbO4 ijxi2JIhh7EEWU4tRHsF2oHkP4kP9uLcBcA7X6wuCVVUwIZjTPF3A5WPmGGZRAS/SM7O kpBeqNqaCAG/azVKhkatqLB44FTHvlPDn4JCzdnIcV0K2w+C/LIt75/qh+bGIFikiW6f yj/geToAuZeJsOhK2aZbkTrh312xkb6XOEV4YOBLYUUoI3ZuwXU3Y1MgsJYMNjwzd4ym RO2jD5bhZz0WVdyYvLqeDCsvA1R8cf6mrwMgprwSaZuEVqMTe3aDvDpbtiysVHjvAD3k SVsg== X-Gm-Message-State: AGRZ1gLW5EhTRWeqbBYUqPZhCLr6st2KHVEKhMgqMBlZ7tZ2wiIZnKkx 27nnz9yx+9kKirmBHOAofJAZhvNodjQ= X-Google-Smtp-Source: AJdET5dL8T/Wehfs2C4P+y0nAbJW0AuSc4LpGYu1BAGeD6YRuhTh9wHsPsPaO6sjvmlVpQXiQ3N4Bg== X-Received: by 2002:a19:945b:: with SMTP id w88mr7413735lfd.15.1542479257659; Sat, 17 Nov 2018 10:27:37 -0800 (PST) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com. [209.85.208.180]) by smtp.gmail.com with ESMTPSA id t144sm4836942lff.53.2018.11.17.10.27.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Nov 2018 10:27:37 -0800 (PST) Received: by mail-lj1-f180.google.com with SMTP id x85-v6so23035538ljb.2; Sat, 17 Nov 2018 10:27:37 -0800 (PST) X-Received: by 2002:a2e:9783:: with SMTP id y3-v6mr8403073lji.167.1542479256747; Sat, 17 Nov 2018 10:27:36 -0800 (PST) MIME-Version: 1.0 References: <201811171808.wAHI8Aqk088309@repo.freebsd.org> In-Reply-To: <201811171808.wAHI8Aqk088309@repo.freebsd.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Sat, 17 Nov 2018 18:27:19 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r485187 - in head/cad/openvsp: . files To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 783657815D X-Spamd-Result: default: False [-2.05 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; RCVD_IN_DNSWL_NONE(0.00)[41.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.06)[ipnet: 209.85.128.0/17(-3.41), asn: 15169(-1.81), country: US(-0.10)]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2018 18:35:26 -0000 On Sat, Nov 17, 2018 at 7:08 PM Fernando Apestegu=C3=ADa wrote: > > Author: fernape > Date: Sat Nov 17 18:08:10 2018 > New Revision: 485187 > URL: https://svnweb.freebsd.org/changeset/ports/485187 > > Log: > cad/openvsp: Unbreak port > > Port was broken after last compilers updates in 11 and 12. > Clang is now able to compile the port but we need to patch as_callfunc_= x86.cpp > unconditionally, otherwise clang complains (or dies, depending on the v= ersion) > with: > > this directive must appear between .cfi_startproc and .cfi_endproc dire= ctives > > Also use localbase to simplify flags handling. > > Reported by: pkg-fallout Sorry, I should've added Approved by: mentors (implicit) > > Added: > head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_s= ource_as__callfunc__x86.cpp > - copied unchanged from r485186, head/cad/openvsp/files/extra-src_ex= ternal_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp > Deleted: > head/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_s= ource_as__callfunc__x86.cpp > Modified: > head/cad/openvsp/Makefile > > Modified: head/cad/openvsp/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/cad/openvsp/Makefile Sat Nov 17 18:04:08 2018 (r485186) > +++ head/cad/openvsp/Makefile Sat Nov 17 18:08:10 2018 (r485187) > @@ -30,22 +30,15 @@ BUILD_DEPENDS=3D ${LOCALBASE}/lib/libopenNURBS.a= :graphic > ${LOCALBASE}/include/glm/glm.hpp:math/glm \ > ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/lib= pthread-stubs > > -CMAKE_SOURCE_PATH=3D ${WRKSRC}/SuperProject > -CMAKE_INSTALL_PREFIX=3D ${STAGEDIR}${PREFIX} > +USES=3D compiler:c++11-lang cmake:outsource,noninja localbase\ > + gl gnome jpeg > > -USES=3D cmake:outsource,noninja jpeg > - > USE_GITHUB=3D yes > GH_PROJECT=3D OpenVSP > GH_ACCOUNT=3D ${GH_PROJECT} > > -# On FreeBSD < 11 libc++ lacks support for sized delete operators. > -# GCC dropped the builtin version of these operators in 6+ by > -# defaulting to gnu++14. Force c++11 instead. > -# For a more detailed discussion see: > -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D219484 > -USE_CXXSTD=3D gnu++11 > - > +CMAKE_SOURCE_PATH=3D ${WRKSRC}/SuperProject > +CMAKE_INSTALL_PREFIX=3D ${STAGEDIR}${PREFIX} > CMAKE_ARGS=3D -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=3Dyes \ > -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=3Dyes \ > -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=3Dno \ > @@ -60,23 +53,8 @@ USE_XORG=3D ice sm x11 xau xcb xdamage xdmcp xext x= fixes > USE_GL=3D gl glu > > USE_GNOME=3D libxml2 > -CFLAGS+=3D -I${LOCALBASE}/include/openNURBS > > .include > - > -# In 12 gcc can not compile the port so switch to clang 5.0.0 in base. > -# But wait! It crashes while compiling so apply a patch to avoid weird a= sm code > -# that makes clang die > -# For details see: > -# https://lists.freebsd.org/pipermail/freebsd-hackers/2017-August/051352= .html > - > -.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} >=3D 1200000 > -USES+=3D compiler:c++11-lib > -EXTRA_PATCHES=3D ${FILESDIR}/extra-src_external_angelscript_sdk_angelscr= ipt_source_as__callfunc__x86.cpp > -CFLAGS+=3D -I${LOCALBASE}/include > -.else > -USES+=3D compiler:gcc-c++11-lib > -.endif > > BUILD_PREFIX=3D OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBS= D/ZIP/OpenVSP-${DISTVERSION}-FreeBSD > > > Copied: head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelsc= ript_source_as__callfunc__x86.cpp (from r485186, head/cad/openvsp/files/ext= ra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp) > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript= _source_as__callfunc__x86.cpp Sat Nov 17 18:08:10 2018 (r485187, co= py of r485186, head/cad/openvsp/files/extra-src_external_angelscript_sdk_an= gelscript_source_as__callfunc__x86.cpp) > @@ -0,0 +1,164 @@ > +--- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.= orig 2017-08-02 20:09:54 UTC > ++++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp > +@@ -340,7 +340,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(args), asPWORD(paramSize), asPW= ORD(func)}; > + > + asm __volatile__( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -385,7 +385,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -462,7 +462,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -508,7 +508,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -585,7 +585,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -631,7 +631,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -717,7 +717,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func), asPWORD(retPtr)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -767,7 +767,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -849,7 +849,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(args), asPWORD(paramSize), asPW= ORD(func), asPWORD(retPtr)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -896,7 +896,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -980,7 +980,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func), asPWORD(retPtr)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -1030,7 +1030,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -1102,7 +1102,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(args), asPWORD(paramSize), asPW= ORD(func)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -1145,7 +1145,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -1233,7 +1233,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -1285,7 +1285,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" > +@@ -1380,7 +1380,7 @@ endcopy: > + volatile asPWORD a[] =3D {asPWORD(obj), asPWORD(args), asPWORD(pa= ramSize), asPWORD(func), asPWORD(retPtr)}; > + > + asm __volatile__ ( > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // When compiled with optimizations the stack unwind does= n't work properly, > + // causing exceptions to crash the application. By adding= this prologue > + // and the epilogue below, the stack unwind works as it s= hould. > +@@ -1445,7 +1445,7 @@ endcopy: > + // Pop the alignment bytes > + "popl %%esp \n" > + "popl %%ebx \n" > +-#ifdef __OPTIMIZE__ > ++#if defined(__OPTIMIZE__) && !defined(__clang__) > + // Epilogue > + "movl %%ebp, %%esp \n" > + ".cfi_def_cfa_register esp \n" >