diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-04-21 08:35:53 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-04-21 08:35:53 +0000 |
| commit | 8039f626dddead72b0d9d9e647ccd71a94514d6b (patch) | |
| tree | f2290ccf1469beffca353df523e24e759ab37db2 | |
| parent | Update to 0.6.2. (diff) | |
On sparc64 libgcj is not built by default (and won't build easily), so we
need to dynamically construct pkg-plist to take this into account.
Noticed by: bento+kris
Notes
Notes:
svn path=/head/; revision=79400
| -rw-r--r-- | lang/gcc32/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc32/pkg-plist | 8 | ||||
| -rw-r--r-- | lang/gcc32/pkg-plist.libgcj | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index ccf862df660d..b1f588c40d6f 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -206,6 +206,10 @@ post-install: ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib cd ${WRKDIR} ; ex < ex.script +.if ${ARCH} != "sparc64" + # libgcj is built on all platforms except sparc64. + ${CAT} pkg-plist.libgcj >> ${TMPPLIST} +.endif cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/ diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist index 5bfd8f9013ff..32d1c6f9c714 100644 --- a/lang/gcc32/pkg-plist +++ b/lang/gcc32/pkg-plist @@ -1,5 +1,4 @@ @comment $FreeBSD$ -bin/addr2name.awk bin/cpp32 bin/g++filt32 bin/g++32 @@ -9,23 +8,16 @@ 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 diff --git a/lang/gcc32/pkg-plist.libgcj b/lang/gcc32/pkg-plist.libgcj new file mode 100644 index 000000000000..3d16a35eb55f --- /dev/null +++ b/lang/gcc32/pkg-plist.libgcj @@ -0,0 +1,8 @@ +bin/addr2name.awk +bin/gij +bin/jv-convert +bin/rmic +bin/rmiregistry +lib/security/classpath.security +lib/security/libgcj.security +share/java/libgcj-3.2.2.jar |