diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-03-26 17:42:31 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-03-26 17:42:31 +0000 |
| commit | 29245523d4e71344279a621a76f96d1b24649eda (patch) | |
| tree | c5329dd48b58d2ff72493b34ce11c8cb816aee1d /lang/gcc32 | |
| parent | Update to 2.04 rc1 (diff) | |
Enable libgcj (which has actually been building fine since GCC 3.1 on
FreeBSD/i386 and works on FreeBSD/alpha using the hack in files/patch-ub).
PR: 47790
Partially Submitted by: Loren James Rittle <rittle@labs.mot.com>
Notes
Notes:
svn path=/head/; revision=77491
Diffstat (limited to 'lang/gcc32')
| -rw-r--r-- | lang/gcc32/Makefile | 3 | ||||
| -rw-r--r-- | lang/gcc32/files/patch-ub | 32 | ||||
| -rw-r--r-- | lang/gcc32/pkg-plist | 8 |
3 files changed, 41 insertions, 2 deletions
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index 187e2992bfd4..e49d20e3aba9 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -SNAPDATE= 2003-02-05 +SNAPDATE= 2003-03-26 SNAPVER= ${SNAPDATE:S/-//g} PORTNAME= gcc @@ -58,7 +58,6 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \ --with-gxx-include-dir=${TARGLIB}/include/g++-v3 #CONFIGURE_ARGS+= --program-suffix=32 CONFIGURE_ARGS+= --with-system-zlib --includedir=${TARGLIB}/include/Java -CONFIGURE_ARGS+= --disable-libgcj # does not bootstrap now CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared diff --git a/lang/gcc32/files/patch-ub b/lang/gcc32/files/patch-ub new file mode 100644 index 000000000000..920e228f5edb --- /dev/null +++ b/lang/gcc32/files/patch-ub @@ -0,0 +1,32 @@ +--- gcc/java/gjavah.c.orig Wed Feb 5 20:39:02 2003 ++++ gcc/java/gjavah.c Wed Feb 5 20:43:53 2003 +@@ -750,10 +750,14 @@ + jfloat fnum = JPOOL_FLOAT (jcf, current_field_value); + fputs ("const jfloat ", out); + print_field_name (out, jcf, name_index, 0); ++#ifdef __alpha__ ++ fputs (";\n", out); ++#else + if (! java_float_finite (fnum)) + fputs (";\n", out); + else + fprintf (out, " = %.10g;\n", fnum); ++#endif + } + break; + case CONSTANT_Double: +@@ -761,10 +765,14 @@ + jdouble dnum = JPOOL_DOUBLE (jcf, current_field_value); + fputs ("const jdouble ", out); + print_field_name (out, jcf, name_index, 0); ++#ifdef __alpha__ ++ fputs (";\n", out); ++#else + if (! java_double_finite (dnum)) + fputs (";\n", out); + else + fprintf (out, " = %.17g;\n", dnum); ++#endif + } + break; + default: diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist index 32d1c6f9c714..5bfd8f9013ff 100644 --- a/lang/gcc32/pkg-plist +++ b/lang/gcc32/pkg-plist @@ -1,4 +1,5 @@ @comment $FreeBSD$ +bin/addr2name.awk bin/cpp32 bin/g++filt32 bin/g++32 @@ -8,16 +9,23 @@ bin/gcov32 bin/%%GNU_HOST%%-gcc32 bin/%%GNU_HOST%%-g++32 bin/gccbug-%%SNAPVER%% +bin/gij bin/gcj32 bin/gcjh32 +bin/jv-convert bin/jv-scan32 bin/jcf-dump32 bin/jar32 bin/grepjar32 +bin/rmic +bin/rmiregistry @comment not needed post-libstdc++-v3: %%GNU_HOST%%/include/_G_config.h @comment Insert PLIST.gcc-lib here @comment -=[ begin PLIST.gcc-lib ]=- @comment -=[ end PLIST.gcc-lib ]=- +lib/security/classpath.security +lib/security/libgcj.security +share/java/libgcj-3.2.2.jar @unexec install-info --delete %D/info/cpp.info %D/info/dir @unexec install-info --delete %D/info/cppinternals.info %D/info/dir @unexec install-info --delete %D/info/g77.info %D/info/dir |