Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10493/10.4/stable/main/finkinfo/base
Modified Files:
dpkg.info gettext-tools.info libgettext8-shlibs.info
Log Message:
Force detection of /usr/bin/java and /usr/bin/javac so that we don't have
to have Bcons: gcc4N for powerpc.
Index: gettext-tools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-tools.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gettext-tools.info 31 Mar 2013 00:44:37 -0000 1.15
+++ gettext-tools.info 10 Jun 2013 01:33:08 -0000 1.16
@@ -28,12 +28,6 @@
libncurses5 (>= 5.4-20041023-1011)
<<
Conflicts: gettext-tools-0.17
-BuildConflicts: <<
- ( %m = powerpc ) gcc45,
- ( %m = powerpc ) gcc46,
- ( %m = powerpc ) gcc47,
- ( %m = powerpc ) gcc48
-<<
Replaces: gettext-dev (<= 0.10.40-20), gettext (<= 0.10.40-4), gettext-bin (<=
0.10.40-20), libgettext3-shlibs (<< 0.14.5-1), libgettextpo2-shlibs (<<
0.14.5-2), gettext-tools-0.17
### When gettext-tools gets updated, make sure these ./configure parameters
@@ -62,7 +56,7 @@
CompileScript: <<
#!/bin/sh -ev
cd gettext-tools
- env EMACS=no ./configure %c
+ env EMACS=no JAVA=/usr/bin/java GCJ=/usr/bin/javac ./configure %c
make -w
<<
InfoTest: <<
@@ -185,6 +179,10 @@
Don't bother checking for AIX-specific bug (test is bugged on
clang). See:
http://lists.gnu.org/archive/html/bug-autoconf/2010-08/msg00116.html
+
+ --disable-java --disable-native-java don't stop configure-time checking,
+ and gcj cause hangups on powerpc. Setting JAVA=/usr/bin/java and
+ GCJ=/usr/bin/javac avoids that.
<<
Index: libgettext8-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libgettext8-shlibs.info 31 Mar 2013 00:44:37 -0000 1.7
+++ libgettext8-shlibs.info 10 Jun 2013 01:33:08 -0000 1.8
@@ -13,12 +13,6 @@
Essential: yes
Depends: libiconv, libiconv-bin, base-files
BuildDepends: libiconv-dev, fink (>= 0.24.12)
-BuildConflicts: <<
- ( %m = powerpc ) gcc45,
- ( %m = powerpc ) gcc46,
- ( %m = powerpc ) gcc47,
- ( %m = powerpc ) gcc48
-<<
#UseMaxBuildJobs: false
SetCFLAGS: -Os
ConfigureParams: <<
@@ -41,7 +35,7 @@
CompileScript: <<
#!/bin/sh -ev
cd gettext-runtime
- env EMACS=no CCACHE_DISABLE=1 ./configure %c
+ env EMACS=no CCACHE_DISABLE=1 JAVA=/usr/bin/java JAVAC=/usr/bin/javac
./configure %c
make
<<
InstallScript: <<
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dpkg.info 31 Mar 2013 00:44:37 -0000 1.23
+++ dpkg.info 10 Jun 2013 01:33:08 -0000 1.24
@@ -3,12 +3,6 @@
Revision: 1236
GCC: 4.0
BuildDepends: fink (>= 0.30.0)
-BuildConflicts: <<
- ( %m = powerpc ) gcc45,
- ( %m = powerpc ) gcc46,
- ( %m = powerpc ) gcc47,
- ( %m = powerpc ) gcc48
-<<
Depends: libgettext8-shlibs (>= 0.18.2.1-1), libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
Essential: yes
UseMaxBuildJobs: false
@@ -42,7 +36,7 @@
### Not necessary, but will avoid unforeseen consequences.
%p/bin/fink -y install gettext-bin libgettext8-dev libiconv-dev
libncurses5
cd %b/../gettext-0.18.2.1/gettext-tools
- env EMACS=no ./configure \
+ env EMACS=no JAVA=/usr/bin/java GCJ=/usr/bin/javac ./configure \
--prefix="%b/../_inst%p" \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
------------------------------------------------------------------------------
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
