[28529] trunk/base

[source_changes at macosforge.org]

Revision: 28529
          http://trac.macosforge.org/projects/macports/changeset/28529
Author:   mww at macports.org
Date:     2007-09-02 17:30:19 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
add & document configure.javac/classpath for Java flags

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/doc/portfile.7
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2007-09-02 23:19:48 UTC (rev 28528)
+++ trunk/base/ChangeLog	2007-09-03 00:30:19 UTC (rev 28529)
@@ -6,8 +6,10 @@
 
 Unreleased:
 
-    - add configure.fflags for Fortran flags
+    - add configure.javac/classpath for Java flags
 
+    - add configure.fflags/fcflags/f90flags for Fortran flags
+
     - Mark "python" group code as deprecated
 
     - Add group code for Python 3.0

Modified: trunk/base/doc/portfile.7
===================================================================
--- trunk/base/doc/portfile.7	2007-09-02 23:19:48 UTC (rev 28528)
+++ trunk/base/doc/portfile.7	2007-09-03 00:30:19 UTC (rev 28529)
@@ -841,6 +841,11 @@
 .br
 .Sy Default:
 .Em -O2
+.It Ic configure.classpath
+Flags to put in the CLASSPATH environment variable when invoking the configure script.
+.br 
+.Sy Type:
+.Em optional
 .It Ic configure.cc
 C-compiler to put in the CC environment variable when invoking the configure script.
 .br
@@ -874,6 +879,11 @@
 .br
 .Sy Type:
 .Em optional
+.It Ic configure.javac
+Java compiler to put in the JAVAC environment variable when invoking the configure script.
+.br
+.Sy Type:
+.Em optional
 .It Ic configure.compiler
 Selects a complete compiler suite to use. This option will override the compiler environment variable for all compilers the named suite features. Please note that this option will intentionally not set any dependencies on the selected compiler suite!
 .Em gcc-3.3

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2007-09-02 23:19:48 UTC (rev 28528)
+++ trunk/base/src/port1.0/portconfigure.tcl	2007-09-03 00:30:19 UTC (rev 28529)
@@ -53,7 +53,7 @@
 default use_configure yes
 
 # Configure special environment variables.
-options configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags
+options configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath
 # We could have default debug/optimization flags at some point.
 default configure.cflags	{-O2}
 default configure.cppflags	{"-I${prefix}/include"}
@@ -62,6 +62,7 @@
 default configure.fflags	{-O2}
 default configure.f90flags	{-O2}
 default configure.fcflags	{-O2}
+default configure.classpath	{}
 
 # Universal options & default values.
 options configure.universal_args		configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags configure.universal_env
@@ -72,13 +73,14 @@
 default configure.universal_ldflags		{"-arch i386 -arch ppc"}
 
 # Select a distinct compiler (C, C preprocessor, C++)
-options configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.compiler
+options configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.javac configure.compiler
 default configure.cc			{}
 default configure.cxx			{}
 default configure.cpp			{}
 default configure.f77			{}
 default configure.f90			{}
 default configure.fc			{}
+default configure.javac			{}
 default configure.compiler		{}
 
 set_ui_prefix
@@ -116,8 +118,8 @@
 proc configure_main {args} {
     global [info globals]
     global worksrcpath use_configure use_autoconf use_automake use_xmkmf
-    global configure.env configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags
-    global configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.compiler prefix
+    global configure.env configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath
+    global configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
     global os.platform os.major
     
     if {[tbool use_automake]} {
@@ -229,6 +231,7 @@
 		append_list_to_environment_value configure "FC" ${configure.fc}
 		append_list_to_environment_value configure "F77" ${configure.f77}
 		append_list_to_environment_value configure "F90" ${configure.f90}
+		append_list_to_environment_value configure "JAVAC" ${configure.javac}
 		append_list_to_environment_value configure "CFLAGS" ${configure.cflags}
 		append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
 		append_list_to_environment_value configure "CXXFLAGS" ${configure.cxxflags}
@@ -236,6 +239,7 @@
 		append_list_to_environment_value configure "FFLAGS" ${configure.fflags}
 		append_list_to_environment_value configure "F90FLAGS" ${configure.f90flags}
 		append_list_to_environment_value configure "FCFLAGS" ${configure.fcflags}
+		append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
 
 		# Execute the command (with the new environment).
 		if {[catch {command_exec configure} result]} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070902/209fcdb2/attachment.html