sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.10.2.

Browse source 
* Loosen the error around USE_ANT and do-build [1]
* Add a check for CFLAGS and CXXFLAGS in CONFIGURE_ENV [2]
* Add a check for Fortran flags in CONFIGURE_ENV [3]

PR:             128482 [2]
Requested by:   Dominic Fandrey <kamikaze@bsdforen.de> [1]
                gerlad [3]
Submitted by:   amdmi3 [2]
This commit is contained in:
Joe Marcus Clarke 2009-01-18 18:49:58 +00:00
parent c7117d4332
commit 76229fb04e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=226377
2 changed files with 61 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ports-mgmt/portlint/Makefile
View file

@ -8,8 +8,7 @@
#
PORTNAME= portlint
PORTVERSION= 2.10.1
PORTREVISION= 1
PORTVERSION= 2.10.2
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

67
ports-mgmt/portlint/src/portlint.pl
View file

@ -17,7 +17,7 @@
# OpenBSD and NetBSD will be accepted.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.162 2008/10/22 22:04:38 marcus Exp $
# $MCom: portlint/portlint.pl,v 1.163 2009/01/18 18:49:03 marcus Exp $
#
use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_g $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@ -46,7 +46,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 10;
my $micro = 1;
my $micro = 2;
sub l { '[{(]'; }
sub r { '[)}]'; }
@ -1720,7 +1720,7 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
}
#
# while file: check for use of paths that have macro replacements
# whole file: check for use of paths that have macro replacements
#
my %pathnames = ();
print "OK: checking for paths that have macro replacements.\n"
@ -1838,7 +1838,6 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
}
}
#
# whole file: USE_JAVA check
#
@ -1892,6 +1891,60 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
"in CONFIGURE_ARGS as they are already set in bsd.port.mk");
}
#
# whole file: CONFIGURE_ENV
#
if ($whole =~ /\nCONFIGURE_ENV[?:]?=\s*([^\\\n]+(\\\n[^\\\n]+)*)/) {
my $configure_env = $1;
my $cflags = undef;
my $cxxflags = undef;
if ($configure_env =~ /\bCFLAGS="([^"]+)"/ ||
$configure_env =~ /\bCFLAGS='([^']+)'/ ||
$configure_env =~ /\bCFLAGS=(\S+)/) {
$cflags = $1;
}
if ($configure_env =~ /\bCXXFLAGS="([^"]+)"/ ||
$configure_env =~ /\bCXXFLAGS='([^']+)'/ ||
$configure_env =~ /\bCXXFLAGS=(\S+)/) {
$cxxflags = $1;
}
if (defined($cflags) || defined($cxxflags)) {
&perror("WARN", $file, -1, "CFLAGS/CXXFLAGS are not needed in ".
"CONFIGURE_ENV as they are already added there in bsd.port.mk.");
}
if ($makevar{GNU_CONFIGURE} ne '') {
if ((defined($cflags) && $cflags =~ /-I/) ||
(defined($cxxflags) && $cxxflags =~ /-I/)) {
&perror("WARN", $file, -1, "Consider passing include paths ".
"to configure via CPPFLAGS environment variable ".
"i.e. CPPFLAGS=\"-I...\" in CONFIGURE_ENV)");
}
}
if (defined($cflags) && $cflags !~ /\$\{CFLAGS/) {
&perror("FATAL", $file, -1, "CFLAGS are clobbered in ".
"CONFIGURE_ENV. Alter CFLAGS in the Makefile with ".
"CFLAGS+=... instead");
}
if (defined($cxxflags) && $cflags !~ /\$\{CXXFLAGS/) {
&perror("FATAL", $file, -1, "CXXFLAGS are clobbered in ".
"CONFIGURE_ENV. Alter CXXFLAGS in the Makefile with ".
"CXXFLAGS+=... instead");
}
if ($configure_env =~ /(FC)=/ ||
$configure_env =~ /(F77)=/ ||
$configure_env =~ /(FCFLAGS)=/) {
&perror("FATAL", $file, -1, "The Fortran flag, $1 is already ".
"passed in CONFIGURE_ENV via bsd.gcc.mk. If you need to ".
"override the the default value, alter $1 in the Makefile ".
"instead with $1=...");
}
}
#
# slave port check
#
@ -2747,9 +2800,9 @@ FETCH_DEPENDS DEPENDS_TARGET
}
if ($tmp =~ /^do-build:/m && $use_ant) {
&perror("FATAL", $file, -1, "USE_ANT is intended only for ports that ".
"build with Ant. You should not override ``do-build'' when ".
"defining USE_ANT");
&perror("WARN", $file, -1, "USE_ANT is intended only for ports that ".
"build with Ant. It is recommended not to override the default ".
"'do-build:' target when defining USE_ANT");
}
#