Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11647/10.4/stable/main/finkinfo/devel
Modified Files:
bison.info
Log Message:
Ensure that the system's Java is used at configure time without the
BuildConflicts.
Index: bison.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/bison.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bison.info 7 Jun 2013 00:16:06 -0000 1.12
+++ bison.info 7 Jun 2013 16:36:08 -0000 1.13
@@ -3,12 +3,17 @@
Revision: 1001
Source: gnu
Maintainer: Darian Lanx <dmal...@users.sourceforge.net>
-BuildDepends: gawk, libiconv-dev, gettext-bin, gettext-tools, libgettext8-dev,
m4
+BuildDepends: gawk, libiconv-dev, gettext-bin, gettext-tools, libgettext8-dev,
m4, system-java, system-java-dev, fink-package-precedence
Depends: libgettext8-shlibs, libiconv, m4
-BuildConflicts: gcc42, gcc43, gcc44, gcc45, gcc46, gcc47, gcc48
-ConfigureParams: --with-libiconv-prefix=%p --with-libintl-prefix=%p
--mandir=%p/share/man --infodir=%p/share/info --disable-dependency-tracking
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+ConfigureParams: --with-libiconv-prefix=%p --with-libintl-prefix=%p
--mandir=%p/share/man --infodir=%p/share/info
+UseMaxBuildJobs: false
+CompileScript: <<
+ #!/bin/sh -ev
+ export JAVA=/usr/bin/java
+ export JAVAC=/usr/bin/javac
+ %{default_script}
+ fink-package-precedence .
+<<
InfoTest: <<
# rely on java/javac instead of gij for java testsuite
TestScript: make check || exit 2
@@ -36,7 +41,10 @@
locale.alias is deleted because it is already provided by gettext which
is an essential package, hence we can rely on the file to be always present.
-The only C++ is in the self-test suite
+The only C++ is in the self-test suite.
+
+Force use of the system's java at build time because otherwise the package
+will find gcj from gcc4N, if installed.
<<
License: GPL/GFDL
Homepage: http://www.gnu.org/software/bison/bison.html
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
