diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile index db69407a0a7d..4c310e9f608d 100644 --- a/devel/i386-rtems-objc/Makefile +++ b/devel/i386-rtems-objc/Makefile @@ -1,78 +1,78 @@ # New ports collection makefile for: i386-rtems-objc # Date created: 9 June 2000 # Whom: James Housley # # $FreeBSD$ # PORTNAME= objc PORTVERSION= 3.2.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \ ${MASTER_SITE_GNU:S/$/:gcc/} MASTER_SITE_SUBDIR= newlib \ gcc/${GCCNAME}/:gcc DISTFILES= ${NEWLIBNAME}.tar.gz \ ${OBJCNAME}.tar.gz:gcc PATCHFILES= ${OBJCNAME}-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 OBJC-gcc-3.2.1 base-port for RTEMS development .include .if ${OSVERSION} >= 500113 BROKEN= "Does not build" .endif LCLTARGET?= i386-rtems GCCVERSION= 3.2.3 OBJCNAME= gcc-${GCCVERSION} PLIST_SUB+= "GCCVERSION=${GCCVERSION}" NEWLIBNAME= newlib-1.11.0 MASTERDIR= ${.CURDIR}/../i386-rtems-objc PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET} BUILD_DEPENDS= autoheader:${PORTSDIR}/devel/autoconf \ ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc RUN_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc PKGNAMEPREFIX= ${LCLTARGET}- USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= all info NO_CPUCFLAGS= yes CONFIGURE_TARGET?= --target=${LCLTARGET} CONFIGURE_ARGS?= --with-gnu-as --with-gnu-ld --with-newlib --verbose \ --enable-languages="objc" \ --with-libiconv-prefix=${LOCALBASE} \ --without-included-gettext CONFIGURE_WRKSRC?= ${WRKDIR}/build-${LCLTARGET} CONFIGURE_SCRIPT?= ../${OBJCNAME}/configure PATCH_WRKSRC= ${WRKDIR} PATCH_STRIP= -p MAKE_FLAGS= LANGUAGES="objc" pre-configure: @(cd ${WRKDIR} ; \ cd ${OBJCNAME} ; ${LN} -fs ../${NEWLIBNAME}/newlib . ; \ cd .. ; \ ${MKDIR} build-${LCLTARGET}) do-build: @(cd ${WRKDIR}/build-${LCLTARGET} ; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: @(cd ${WRKDIR}/build-${LCLTARGET} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .include diff --git a/devel/i386-rtems-objc/files/patch-ab b/devel/i386-rtems-objc/files/patch-ab index 59ff3af2d4ea..e057897789a8 100644 --- a/devel/i386-rtems-objc/files/patch-ab +++ b/devel/i386-rtems-objc/files/patch-ab @@ -1,86 +1,87 @@ --- 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 ++++ gcc-3.2.3/gcc/Makefile.in Sun Nov 16 21:11:17 2003 @@ -405,7 +405,7 @@ # It is convenient for configure to add the assignment at the beginning, # so don't override it here. -USE_COLLECT2 = collect2$(exeext) +USE_COLLECT2 = # List of extra C and assembler files to add to static and shared libgcc2. # Assembler files should have names ending in `.asm'. @@ -445,7 +445,7 @@ # A list of all the language-specific executables. # This is overridden by configure. -COMPILERS = cc1$(exeext) @all_compilers@ +COMPILERS = @all_compilers@ # List of things which should already be built whenever we try to use xgcc # to compile anything (without linking). @@ -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. -install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \ - $(INSTALL_CPP) install-man install-info intl.install install-@POSUB@ \ - lang.install-normal install-driver +install: install-common \ + intl.install lang.install-normal # Handle cpp installation. install-cpp: cpp$(exeext) -@@ -2581,53 +2580,6 @@ +@@ -2581,54 +2580,6 @@ else true; \ fi; \ done - for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \ - if [ x"$$file" != x.. ]; then \ - 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 $(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 $(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 $(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 $(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 $(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 $(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 $(DESTDIR)$(bindir)/gcov$(exeext); \ - $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ - fi - $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME) +- $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME) # Install the driver program as $(target_alias)-gcc + # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.