diff options
-rw-r--r-- | devel/i386-rtems-gcj/Makefile | 22 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/distinfo | 6 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/files/patch-aa | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/files/patch-ab | 60 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.arm-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.i386-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.m68k-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.mips-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.powerpc-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.sh-rtems | 4 | ||||
-rw-r--r-- | devel/i386-rtems-gcj/pkg-plist.sparc-rtems | 4 |
11 files changed, 65 insertions, 55 deletions
diff --git a/devel/i386-rtems-gcj/Makefile b/devel/i386-rtems-gcj/Makefile index 64dc13177c0..98f1c214a56 100644 --- a/devel/i386-rtems-gcj/Makefile +++ b/devel/i386-rtems-gcj/Makefile @@ -15,17 +15,25 @@ MASTER_SITE_SUBDIR= newlib \ ${PORTNAME}/${GCCNAME}/:gcc DISTFILES= ${NEWLIBNAME}.tar.gz \ ${JAVANAME}.tar.gz:gcc -PATCHFILES= ${JAVANAME}-rtems-20021209.diff \ - ${NEWLIBNAME}-rtems-20030120.diff +PATCHFILES= ${JAVANAME}-rtems-20030507a.diff \ + ${NEWLIBNAME}-rtems-20030605.diff PATCH_SITES= ftp://ftp.rtems.com/pub/rtems/snapshots/c_tools/source/ \ http://rtems.thehousleys.net/ MAINTAINER= jeh@FreeBSD.org COMMENT= FSF JAVA-gcc-3.2.1 base-port for RTEMS development +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not build" +.endif + LCLTARGET?= i386-rtems -JAVANAME= gcc-3.2.1 +GCCVERSION= 3.2.3 +JAVANAME= gcc-${GCCVERSION} +PLIST_SUB+= "GCCVERSION=${GCCVERSION}" NEWLIBNAME= newlib-1.11.0 MASTERDIR= ${.CURDIR}/../i386-rtems-gcj PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET} @@ -37,12 +45,14 @@ RUN_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc PKGNAMEPREFIX= ${LCLTARGET}- USE_GMAKE= yes GNU_CONFIGURE= yes -ALL_TARGET= all +ALL_TARGET= all info NO_CPUCFLAGS= yes CONFIGURE_TARGET?= --target=${LCLTARGET} CONFIGURE_ARGS?= --with-gnu-as --with-gnu-ld --with-newlib --verbose \ - --enable-languages="java" + --enable-languages="java" \ + --with-libiconv-prefix=${LOCALBASE} \ + --without-included-gettext CONFIGURE_WRKSRC?= ${WRKDIR}/build-${LCLTARGET} CONFIGURE_SCRIPT?= ../${JAVANAME}/configure @@ -65,4 +75,4 @@ do-install: @(cd ${WRKDIR}/build-${LCLTARGET} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/i386-rtems-gcj/distinfo b/devel/i386-rtems-gcj/distinfo index 4c10cd3387a..ec8a0a1daed 100644 --- a/devel/i386-rtems-gcj/distinfo +++ b/devel/i386-rtems-gcj/distinfo @@ -1,4 +1,4 @@ MD5 (newlib-1.11.0.tar.gz) = 74de7de0c9624cd757df63f2ed17a9b4 -MD5 (gcc-3.2.1.tar.gz) = 82c26f362a6df7d2ba5b967606bd7d9a -MD5 (gcc-3.2.1-rtems-20021209.diff) = 70d1c95af96ec4901261810909faeffa -MD5 (newlib-1.11.0-rtems-20030120.diff) = bd3f5e9216a5ea4c66b397908d1e683c +MD5 (gcc-3.2.3.tar.gz) = e951123b2dfd2288c3e9337024dc9e4c +MD5 (gcc-3.2.3-rtems-20030507a.diff) = d4adda8ccba7ad57ee36b7720eadf19c +MD5 (newlib-1.11.0-rtems-20030605.diff) = b1dfdabd92e241d835964c6ef86aa3c9 diff --git a/devel/i386-rtems-gcj/files/patch-aa b/devel/i386-rtems-gcj/files/patch-aa index c74086e2f84..c46cfa95295 100644 --- a/devel/i386-rtems-gcj/files/patch-aa +++ b/devel/i386-rtems-gcj/files/patch-aa @@ -1,5 +1,5 @@ ---- gcc-3.2.1/Makefile.in.orig Mon Oct 7 16:47:05 2002 -+++ gcc-3.2.1/Makefile.in Sun Feb 2 20:20:51 2003 +--- gcc-3.2.3/Makefile.in.orig Mon Oct 7 16:47:05 2002 ++++ gcc-3.2.3/Makefile.in Sun Feb 2 20:20:51 2003 @@ -678,9 +678,7 @@ install-autoconf \ install-automake \ diff --git a/devel/i386-rtems-gcj/files/patch-ab b/devel/i386-rtems-gcj/files/patch-ab index bced888e297..59ff3af2d4e 100644 --- a/devel/i386-rtems-gcj/files/patch-ab +++ b/devel/i386-rtems-gcj/files/patch-ab @@ -1,5 +1,5 @@ ---- gcc-3.2.1/gcc/Makefile.in.orig Mon Oct 14 17:04:16 2002 -+++ gcc-3.2.1/gcc/Makefile.in Sun Feb 2 22:07:09 2003 +--- gcc-3.2.3/gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003 ++++ gcc-3.2.3/gcc/Makefile.in Sat Sep 6 19:45:51 2003 @@ -405,7 +405,7 @@ # It is convenient for configure to add the assignment at the beginning, @@ -18,7 +18,7 @@ # List of things which should already be built whenever we try to use xgcc # to compile anything (without linking). -@@ -2530,9 +2530,8 @@ +@@ -2531,9 +2531,8 @@ # Copy the compiler files into directories where they will be run. # Install the driver last so that the window when things are # broken is small. @@ -30,57 +30,57 @@ # Handle cpp installation. install-cpp: cpp$(exeext) -@@ -2593,53 +2592,6 @@ +@@ -2581,53 +2580,6 @@ else true; \ fi; \ done - for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \ - if [ x"$$file" != x.. ]; then \ -- rm -f $(libsubdir)/$$file; \ -- $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ +- rm -f $(DESTDIR)$(libsubdir)/$$file; \ +- $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \ - else true; fi; \ - done - for file in $(EXTRA_PARTS) ..; do \ - if [ x"$$file" != x.. ]; then \ -- rm -f $(libsubdir)/$$file; \ -- $(INSTALL_DATA) $$file $(libsubdir)/$$file; \ -- chmod a-x $(libsubdir)/$$file; \ +- rm -f $(DESTDIR)$(libsubdir)/$$file; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(libsubdir)/$$file; \ +- chmod a-x $(DESTDIR)$(libsubdir)/$$file; \ - else true; fi; \ - done -# Don't mess with specs if it doesn't exist yet. - -if [ -f specs ] ; then \ -- rm -f $(libsubdir)/specs; \ -- $(INSTALL_DATA) specs $(libsubdir)/specs; \ -- chmod a-x $(libsubdir)/specs; \ +- rm -f $(DESTDIR)$(libsubdir)/specs; \ +- $(INSTALL_DATA) specs $(DESTDIR)$(libsubdir)/specs; \ +- chmod a-x $(DESTDIR)$(libsubdir)/specs; \ - fi -# Install protoize if it was compiled. - -if [ -f protoize$(exeext) ]; \ - then \ - if [ -f gcc-cross$(exeext) ] ; then \ -- rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ -- $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ -- rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ -- $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ +- rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ +- $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ +- rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ +- $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ - else \ -- rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ -- $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ -- rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ -- $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ +- rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ +- $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ +- rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ +- $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ - fi ; \ -- rm -f $(libsubdir)/SYSCALLS.c.X; \ -- $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \ -- chmod a-x $(libsubdir)/SYSCALLS.c.X; \ +- rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ +- $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ +- chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ - fi -- -rm -f $(libsubdir)/cpp0$(exeext) -- $(INSTALL_PROGRAM) cpp0$(exeext) $(libsubdir)/cpp0$(exeext) -- -rm -f $(libsubdir)/tradcpp0$(exeext) -- $(INSTALL_PROGRAM) tradcpp0$(exeext) $(libsubdir)/tradcpp0$(exeext) +- -rm -f $(DESTDIR)$(libsubdir)/cpp0$(exeext) +- $(INSTALL_PROGRAM) cpp0$(exeext) $(DESTDIR)$(libsubdir)/cpp0$(exeext) +- -rm -f $(DESTDIR)$(libsubdir)/tradcpp0$(exeext) +- $(INSTALL_PROGRAM) tradcpp0$(exeext) $(DESTDIR)$(libsubdir)/tradcpp0$(exeext) -# Install gcov if it was compiled. - -if [ -f gcov$(exeext) ]; \ - then \ -- rm -f $(bindir)/gcov$(exeext); \ -- $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ +- rm -f $(DESTDIR)$(bindir)/gcov$(exeext); \ +- $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ - fi - $(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME) + $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME) # Install the driver program as $(target_alias)-gcc diff --git a/devel/i386-rtems-gcj/pkg-plist.arm-rtems b/devel/i386-rtems-gcj/pkg-plist.arm-rtems index 81bb015af5e..dc99a799278 100644 --- a/devel/i386-rtems-gcj/pkg-plist.arm-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.arm-rtems @@ -4,5 +4,5 @@ bin/arm-rtems-jv-scan bin/arm-rtems-jcf-dump bin/grepjar bin/jar -lib/gcc-lib/arm-rtems/3.2.1/jc1 -lib/gcc-lib/arm-rtems/3.2.1/jvgenmain +lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/arm-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.i386-rtems b/devel/i386-rtems-gcj/pkg-plist.i386-rtems index 9a46666687d..189a5ec8085 100644 --- a/devel/i386-rtems-gcj/pkg-plist.i386-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.i386-rtems @@ -4,5 +4,5 @@ bin/i386-rtems-gcjh bin/i386-rtems-jv-scan bin/i386-rtems-jcf-dump bin/jar -lib/gcc-lib/i386-rtems/3.2.1/jc1 -lib/gcc-lib/i386-rtems/3.2.1/jvgenmain +lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/i386-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.m68k-rtems b/devel/i386-rtems-gcj/pkg-plist.m68k-rtems index 4529d960115..9a0b9a500a9 100644 --- a/devel/i386-rtems-gcj/pkg-plist.m68k-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.m68k-rtems @@ -4,5 +4,5 @@ bin/m68k-rtems-gcj bin/m68k-rtems-gcjh bin/m68k-rtems-jv-scan bin/m68k-rtems-jcf-dump -lib/gcc-lib/m68k-rtems/3.2.1/jc1 -lib/gcc-lib/m68k-rtems/3.2.1/jvgenmain +lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/m68k-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.mips-rtems b/devel/i386-rtems-gcj/pkg-plist.mips-rtems index 02bf784723d..db915cdf491 100644 --- a/devel/i386-rtems-gcj/pkg-plist.mips-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.mips-rtems @@ -4,5 +4,5 @@ bin/mips-rtems-gcj bin/mips-rtems-gcjh bin/mips-rtems-jv-scan bin/mips-rtems-jcf-dump -lib/gcc-lib/mips-rtems/3.2.1/jc1 -lib/gcc-lib/mips-rtems/3.2.1/jvgenmain +lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/mips-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems b/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems index 652e09ad8ce..0a27ecf3c23 100644 --- a/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.powerpc-rtems @@ -4,5 +4,5 @@ bin/powerpc-rtems-gcj bin/powerpc-rtems-gcjh bin/powerpc-rtems-jv-scan bin/powerpc-rtems-jcf-dump -lib/gcc-lib/powerpc-rtems/3.2.1/jc1 -lib/gcc-lib/powerpc-rtems/3.2.1/jvgenmain +lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/powerpc-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.sh-rtems b/devel/i386-rtems-gcj/pkg-plist.sh-rtems index 0d7795bf75f..f7043b4e5f1 100644 --- a/devel/i386-rtems-gcj/pkg-plist.sh-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.sh-rtems @@ -4,5 +4,5 @@ bin/sh-rtems-gcj bin/sh-rtems-gcjh bin/sh-rtems-jv-scan bin/sh-rtems-jcf-dump -lib/gcc-lib/sh-rtems/3.2.1/jc1 -lib/gcc-lib/sh-rtems/3.2.1/jvgenmain +lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/sh-rtems/%%GCCVERSION%%/jvgenmain diff --git a/devel/i386-rtems-gcj/pkg-plist.sparc-rtems b/devel/i386-rtems-gcj/pkg-plist.sparc-rtems index 382e2142b93..a054567be94 100644 --- a/devel/i386-rtems-gcj/pkg-plist.sparc-rtems +++ b/devel/i386-rtems-gcj/pkg-plist.sparc-rtems @@ -4,5 +4,5 @@ bin/sparc-rtems-gcj bin/sparc-rtems-gcjh bin/sparc-rtems-jv-scan bin/sparc-rtems-jcf-dump -lib/gcc-lib/sparc-rtems/3.2.1/jc1 -lib/gcc-lib/sparc-rtems/3.2.1/jvgenmain +lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jc1 +lib/gcc-lib/sparc-rtems/%%GCCVERSION%%/jvgenmain |