Date: Thu, 31 Oct 2013 07:11:05 GMT From: John Marino <freebsd@marino.st> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183513: [PATCH] cad/feappv: post-patch target makes matches that can never be true Message-ID: <201310310711.r9V7B5A6099793@oldred.freebsd.org> Resent-Message-ID: <201310310720.r9V7K0YK061497@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183513
>Category: ports
>Synopsis: [PATCH] cad/feappv: post-patch target makes matches that can never be true
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 31 07:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Marino
>Release:
>Organization:
>Environment:
>Description:
The post-patch target tries to replace several lines in ${WRKSRC}/makefile.in. The problem that sed will never match some of the replaces.
Specially, sed assumes FFOPTFLAG and CCOPTFLAG start at the beginning of the line. Perhaps it did in a previous version, but now it doesn't.
In order for these flags to be defined, the attached patch to makefile.in has to be added. It removes the whitespace in Makefile.in, allowing the post-patch target to work.
An alternative approach is to modify the post-patch target to not start at the beginning of the line, but this will also change the commented version (which in the end, doesn't really matter as there is makefile.in.bak with the original version as a result)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- cad/feappv/files/patch-makefile.in.orig 2013-10-31 07:08:31.626902000 +0000
+++ cad/feappv/files/patch-makefile.in
@@ -1 +1,13 @@
-
+--- makefile.in.orig 2013-07-15 19:15:37.000000000 +0000
++++ makefile.in
+@@ -31,8 +31,8 @@ FF = gfortran
+ CC = gcc
+
+ # What optimization level to use
+- FFOPTFLAG = -O3 -ftree-vectorize -Wall
+- CCOPTFLAG = -O3 -ftree-vectorize -Wall
++FFOPTFLAG = -O3 -ftree-vectorize -Wall
++CCOPTFLAG = -O3 -ftree-vectorize -Wall
+
+ # FFOPTFLAG = -g -O3 -ftree-vectorize -Wall
+ # CCOPTFLAG = -g -O3 -ftree-vectorize -Wall
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310310711.r9V7B5A6099793>