svn commit: r338833 - in head/devel/zpu-gcc: . files
Diane Bruce
db at FreeBSD.org
Sun Jan 5 23:27:09 UTC 2014
Author: db
Date: Sun Jan 5 23:27:06 2014
New Revision: 338833
URL: http://svnweb.freebsd.org/changeset/ports/338833
Log:
- enable staging
- add LICENSE
- clean up pkg-plist
Added:
head/devel/zpu-gcc/files/patch-gcc_gcc_Makefile.in (contents, props changed)
head/devel/zpu-gcc/files/patch-gcc_libgloss_zpu_Makefile.in (contents, props changed)
Modified:
head/devel/zpu-gcc/Makefile
head/devel/zpu-gcc/files/configure.sh (contents, props changed)
head/devel/zpu-gcc/files/install.sh (contents, props changed)
head/devel/zpu-gcc/files/patch-gcc_Makefile.in (contents, props changed)
head/devel/zpu-gcc/pkg-plist (contents, props changed)
Modified: head/devel/zpu-gcc/Makefile
==============================================================================
--- head/devel/zpu-gcc/Makefile Sun Jan 5 23:22:14 2014 (r338832)
+++ head/devel/zpu-gcc/Makefile Sun Jan 5 23:27:06 2014 (r338833)
@@ -3,7 +3,6 @@
PORTNAME= zpu-gcc
PORTVERSION= 1.0
CATEGORIES= devel
-#MASTER_SITES= http://people.freebsd.org/~db/
MASTER_SITES= http://opensource.zylin.com/zpudownload.html/
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= db
@@ -13,22 +12,19 @@ MAINTAINER= db at FreeBSD.org
COMMENT= ZPU gcc compiler
BUILD_DEPENDS= ${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
+RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${DISTNAME}/toolchain
-USE_GMAKE= yes
-USES= gettext
-MANPREFIX= ${PREFIX}/zpu
-MAN1= zpu-elf-cpp.1 zpu-elf-gcc.1 zpu-elf-gcov.1
-MAN7= fsf-funding.7 gfdl.7 gpl.7
-INFO= zpuc/cpp zpuc/cppinternals zpuc/gcc zpuc/gccinstall zpuc/gccint
+USES= gettext gmake
+MANDIRS= ${PREFIX}/zpu/man
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
${CP} ${FILESDIR}/install.sh ${WRKSRC}
@${REINPLACE_CMD} -e 's/%%GMAKE%%/${GMAKE}/' ${WRKSRC}/build.sh \
${WRKSRC}/install.sh
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
+ @${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/gcc/Makefile.in
do-install:
cd ${WRKSRC} && ${SH} install.sh
Modified: head/devel/zpu-gcc/files/configure.sh
==============================================================================
--- head/devel/zpu-gcc/files/configure.sh Sun Jan 5 23:22:14 2014 (r338832)
+++ head/devel/zpu-gcc/files/configure.sh Sun Jan 5 23:27:06 2014 (r338833)
@@ -7,7 +7,7 @@ cd build
#gmake install
cd ..
-export PATH=`pwd`/install/bin:$PATH
+export PATH=/usr/local/zpu/bin:$PATH
rm -rf gccbuild
mkdir gccbuild
cd gccbuild
Modified: head/devel/zpu-gcc/files/install.sh
==============================================================================
--- head/devel/zpu-gcc/files/install.sh Sun Jan 5 23:22:14 2014 (r338832)
+++ head/devel/zpu-gcc/files/install.sh Sun Jan 5 23:27:06 2014 (r338833)
@@ -1,3 +1,3 @@
export PATH=/usr/local/zpu/bin:$PATH
cd gccbuild
-gmake install
+%%GMAKE%% install
Modified: head/devel/zpu-gcc/files/patch-gcc_Makefile.in
==============================================================================
--- head/devel/zpu-gcc/files/patch-gcc_Makefile.in Sun Jan 5 23:22:14 2014 (r338832)
+++ head/devel/zpu-gcc/files/patch-gcc_Makefile.in Sun Jan 5 23:27:06 2014 (r338833)
@@ -1,115 +1,11 @@
---- gcc/Makefile.in.orig 2012-10-28 17:13:43.000000000 -0500
-+++ gcc/Makefile.in 2012-10-28 17:16:21.000000000 -0500
-@@ -103,7 +103,7 @@
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+--- gcc/Makefile.in.orig 2014-01-03 18:42:06.597988667 -0500
++++ gcc/Makefile.in 2014-01-03 18:43:34.929982234 -0500
+@@ -385,7 +385,7 @@
- # This is the list of directories to be built for the build system.
--BUILD_CONFIGDIRS = libiberty
-+#BUILD_CONFIGDIRS = libiberty
- # Build programs are put under this directory.
- BUILD_SUBDIR = @build_subdir@
- # This is set by the configure script to the arguments to use when configuring
-@@ -562,7 +562,6 @@
- maybe-configure-itcl \
- maybe-configure-ld \
- maybe-configure-libgui \
-- maybe-configure-libiberty \
- maybe-configure-libtool \
- maybe-configure-m4 \
- maybe-configure-make \
-@@ -603,7 +602,6 @@
- maybe-configure-target-libtermcap \
- maybe-configure-target-winsup \
- maybe-configure-target-libgloss \
-- maybe-configure-target-libiberty \
- maybe-configure-target-gperf \
- maybe-configure-target-examples \
- maybe-configure-target-libffi \
-@@ -651,7 +649,6 @@
- maybe-all-itcl \
- maybe-all-ld \
- maybe-all-libgui \
-- maybe-all-libiberty \
- maybe-all-libtool \
- maybe-all-m4 \
- maybe-all-make \
-@@ -692,7 +689,6 @@
- maybe-all-target-libtermcap \
- maybe-all-target-winsup \
- maybe-all-target-libgloss \
-- maybe-all-target-libiberty \
- maybe-all-target-gperf \
- maybe-all-target-examples \
- maybe-all-target-libffi \
-@@ -744,7 +740,6 @@
- maybe-info-itcl \
- maybe-info-ld \
- maybe-info-libgui \
-- maybe-info-libiberty \
- maybe-info-libtool \
- maybe-info-m4 \
- maybe-info-make \
-@@ -786,7 +781,6 @@
- maybe-info-target-libtermcap \
- maybe-info-target-winsup \
- maybe-info-target-libgloss \
-- maybe-info-target-libiberty \
- maybe-info-target-gperf \
- maybe-info-target-examples \
- maybe-info-target-libffi \
-@@ -2620,7 +2614,6 @@
- maybe-dvi-itcl \
- maybe-dvi-ld \
- maybe-dvi-libgui \
-- maybe-dvi-libiberty \
- maybe-dvi-libtool \
- maybe-dvi-m4 \
- maybe-dvi-make \
-@@ -2662,7 +2655,6 @@
- maybe-dvi-target-libtermcap \
- maybe-dvi-target-winsup \
- maybe-dvi-target-libgloss \
-- maybe-dvi-target-libiberty \
- maybe-dvi-target-gperf \
- maybe-dvi-target-examples \
- maybe-dvi-target-libffi \
-@@ -4496,7 +4488,6 @@
- maybe-TAGS-itcl \
- maybe-TAGS-ld \
- maybe-TAGS-libgui \
-- maybe-TAGS-libiberty \
- maybe-TAGS-libtool \
- maybe-TAGS-m4 \
- maybe-TAGS-make \
-@@ -4538,7 +4529,6 @@
- maybe-TAGS-target-libtermcap \
- maybe-TAGS-target-winsup \
- maybe-TAGS-target-libgloss \
-- maybe-TAGS-target-libiberty \
- maybe-TAGS-target-gperf \
- maybe-TAGS-target-examples \
- maybe-TAGS-target-libffi \
-@@ -6372,7 +6362,6 @@
- maybe-install-info-itcl \
- maybe-install-info-ld \
- maybe-install-info-libgui \
-- maybe-install-info-libiberty \
- maybe-install-info-libtool \
- maybe-install-info-m4 \
- maybe-install-info-make \
-@@ -17425,7 +17414,6 @@
- maybe-install-itcl \
- maybe-install-ld \
- maybe-install-libgui \
-- maybe-install-libiberty \
- maybe-install-libtool \
- maybe-install-m4 \
- maybe-install-make \
-@@ -17492,7 +17480,6 @@
- maybe-install-itcl \
- maybe-install-ld \
- maybe-install-libgui \
-- maybe-install-libiberty \
- maybe-install-libtool \
- maybe-install-m4 \
- maybe-install-make \
+ # Flags to pass down to all sub-makes.
+ BASE_FLAGS_TO_PASS = \
+- "DESTDIR=$(DESTDIR)" \
++ "DESTDIR=%%DESTDIR%%" \
+ "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
+ "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+ "bindir=$(bindir)" \
Added: head/devel/zpu-gcc/files/patch-gcc_gcc_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/zpu-gcc/files/patch-gcc_gcc_Makefile.in Sun Jan 5 23:27:06 2014 (r338833)
@@ -0,0 +1,44 @@
+--- gcc/gcc/Makefile.in.orig 2012-10-11 19:40:24.000000000 -0400
++++ gcc/gcc/Makefile.in 2014-01-05 15:29:59.371874048 -0500
+@@ -762,6 +762,7 @@
+ # subdirectories.
+ # ??? The choices here will need some experimenting with.
+
++DESTDIR=%%DESTDIR%%
+ export AR_FOR_TARGET
+ export AR_CREATE_FOR_TARGET
+ export AR_FLAGS_FOR_TARGET
+@@ -769,7 +770,7 @@
+ export AWK
+ export BUILD_PREFIX
+ export BUILD_PREFIX_1
+-export DESTDIR
++#export DESTDIR
+ export GCC_FOR_TARGET
+ export INCLUDES
+ export INSTALL_DATA
+@@ -2512,6 +2513,7 @@
+
+ .PHONY: install-gcc-tooldir
+ install-gcc-tooldir:
++ echo install-gcc-tooldir DESTDIR = ${DESTDIR}
+ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(gcc_tooldir)
+
+ # Build fixed copies of system files.
+@@ -2919,13 +2921,13 @@
+ -rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
+ -$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
+ -rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)
++ ls -ld gcc-cross$(exeext)
+ -( cd $(DESTDIR)$(bindir) && \
+ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version) )
+ -if [ -f gcc-cross$(exeext) ] ; then \
+- if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
+- rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
++ mkdir -p $(DESTDIR)$(gcc_tooldir)/bin/.; \
++ mkdir -p $(DESTDIR)$(gcc_tooldir)/bin/.; \
+ $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
+- else true; fi; \
+ else \
+ rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
+ ( cd $(DESTDIR)$(bindir) && \
Added: head/devel/zpu-gcc/files/patch-gcc_libgloss_zpu_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/zpu-gcc/files/patch-gcc_libgloss_zpu_Makefile.in Sun Jan 5 23:27:06 2014 (r338833)
@@ -0,0 +1,47 @@
+--- gcc/libgloss/zpu/Makefile.in.orig 2012-10-11 19:40:33.000000000 -0400
++++ gcc/libgloss/zpu/Makefile.in 2014-01-05 16:38:11.241591883 -0500
+@@ -48,12 +48,8 @@
+ RANLIB = @RANLIB@
+ AR_FLAGS = qv
+
+-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
+- then echo ${objroot}/../binutils/objdump ; \
+- else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
+-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
+- then echo ${objroot}/../binutils/objcopy ; \
+- else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
++OBJDUMP = $(prefix)/bin/zpu-elf-objdump
++OBJCOPY = $(prefix)/bin/zpu-elf-objcopy
+
+ SCRIPTS =
+
+@@ -108,10 +104,10 @@
+
+ .PHONY: install info install-info clean-info
+ install: install-scripts
+- $(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+- $(INSTALL_PROGRAM) $(IO) $(tooldir)/lib${MULTISUBDIR}/$(IO)
++ $(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
++ $(INSTALL_PROGRAM) $(IO) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(IO)
+ @for bsp in ${BSP}; do\
+- $(INSTALL_PROGRAM) $${bsp} $(tooldir)/lib${MULTISUBDIR}; \
++ $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+ done
+
+ # Install the linker script in the correct place.
+@@ -122,8 +118,6 @@
+ t='$(program_transform_name)'; \
+ objdump=`echo objdump | sed -e $$t`; \
+ fi ; \
+- name=`$$objdump -f $(CRT0) | sed '/^$$/d'`;
+- name=`$$objdump -f $(IO) | sed '/^$$/d'`;
+
+ doc:
+ info:
+@@ -139,4 +133,4 @@
+ .c.o:
+ $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $(CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections $<
+
+-
+\ No newline at end of file
++
Modified: head/devel/zpu-gcc/pkg-plist
==============================================================================
--- head/devel/zpu-gcc/pkg-plist Sun Jan 5 23:22:14 2014 (r338832)
+++ head/devel/zpu-gcc/pkg-plist Sun Jan 5 23:27:06 2014 (r338833)
@@ -1,4 +1,9 @@
+info/zpuc/cpp.info
+info/zpuc/cppinternals.info
info/zpuc/dir
+info/zpuc/gcc.info
+info/zpuc/gccinstall.info
+info/zpuc/gccint.info
zpu/bin/zpu-elf-cpp
zpu/bin/zpu-elf-gcc
zpu/bin/zpu-elf-gcc-3.4.2
@@ -41,6 +46,12 @@ zpu/libexec/gcc/zpu-elf/3.4.2/install-to
zpu/libexec/gcc/zpu-elf/3.4.2/install-tools/fixproto
zpu/libexec/gcc/zpu-elf/3.4.2/install-tools/mkheaders
zpu/libexec/gcc/zpu-elf/3.4.2/install-tools/mkinstalldirs
+zpu/man/man1/zpu-elf-cpp.1.gz
+zpu/man/man1/zpu-elf-gcc.1.gz
+zpu/man/man1/zpu-elf-gcov.1.gz
+zpu/man/man7/fsf-funding.7.gz
+zpu/man/man7/gfdl.7.gz
+zpu/man/man7/gpl.7.gz
zpu/share/locale/be/LC_MESSAGES/gcc.mo
zpu/share/locale/ca/LC_MESSAGES/gcc.mo
zpu/share/locale/da/LC_MESSAGES/gcc.mo
@@ -135,50 +146,50 @@ zpu/zpu-elf/lib/libbcc.a
zpu/zpu-elf/lib/libc.a
zpu/zpu-elf/lib/libg.a
zpu/zpu-elf/lib/libm.a
- at dirrmtry zpu/bin
- at dirrm zpu/lib/gcc/zpu-elf/3.4.2/install-tools/include
- at dirrm zpu/lib/gcc/zpu-elf/3.4.2/install-tools
- at dirrm zpu/lib/gcc/zpu-elf/3.4.2/include
- at dirrm zpu/lib/gcc/zpu-elf/3.4.2
- at dirrm zpu/lib/gcc/zpu-elf
- at dirrm zpu/lib/gcc
- at dirrmtry zpu/lib
@dirrmtry zpu/zpu-elf/bin
- at dirrm zpu/zpu-elf/include/sys
- at dirrm zpu/zpu-elf/include/machine
- at dirrm zpu/zpu-elf/include
@dirrmtry zpu/zpu-elf
@dirrmtry zpu/share/locale/tr/LC_MESSAGES
- at dirrmtry zpu/share/locale/sv/LC_MESSAGES
- at dirrmtry zpu/share/locale/nl/LC_MESSAGES
- at dirrmtry zpu/share/locale/ja/LC_MESSAGES
- at dirrmtry zpu/share/locale/fr/LC_MESSAGES
- at dirrmtry zpu/share/locale/es/LC_MESSAGES
- at dirrmtry zpu/share/locale/el/LC_MESSAGES
- at dirrmtry zpu/share/locale/da/LC_MESSAGES
- at dirrmtry zpu/share/locale/de/LC_MESSAGES
- at dirrmtry zpu/share/locale/ca/LC_MESSAGES
- at dirrmtry zpu/share/locale/be/LC_MESSAGES
@dirrmtry zpu/share/locale/tr
+ at dirrmtry zpu/share/locale/sv/LC_MESSAGES
@dirrmtry zpu/share/locale/sv
+ at dirrmtry zpu/share/locale/nl/LC_MESSAGES
@dirrmtry zpu/share/locale/nl
+ at dirrmtry zpu/share/locale/ja/LC_MESSAGES
@dirrmtry zpu/share/locale/ja
+ at dirrmtry zpu/share/locale/fr/LC_MESSAGES
@dirrmtry zpu/share/locale/fr
+ at dirrmtry zpu/share/locale/es/LC_MESSAGES
@dirrmtry zpu/share/locale/es
+ at dirrmtry zpu/share/locale/el/LC_MESSAGES
@dirrmtry zpu/share/locale/el
+ at dirrmtry zpu/share/locale/de/LC_MESSAGES
@dirrmtry zpu/share/locale/de
+ at dirrmtry zpu/share/locale/da/LC_MESSAGES
@dirrmtry zpu/share/locale/da
+ at dirrmtry zpu/share/locale/ca/LC_MESSAGES
@dirrmtry zpu/share/locale/ca
+ at dirrmtry zpu/share/locale/be/LC_MESSAGES
@dirrmtry zpu/share/locale/be
@dirrmtry zpu/share/locale
@dirrmtry zpu/share
+ at dirrmtry zpu/man/man7
+ at dirrmtry zpu/man/man1
+ at dirrmtry zpu/man
+ at dirrmtry zpu/lib
+ at dirrmtry zpu/bin
+ at dirrmtry zpu
+ at dirrm zpu/zpu-elf/include/sys
+ at dirrm zpu/zpu-elf/include/machine
+ at dirrm zpu/zpu-elf/include
@dirrm zpu/libexec/gcc/zpu-elf/3.4.2/install-tools
@dirrm zpu/libexec/gcc/zpu-elf/3.4.2
@dirrm zpu/libexec/gcc/zpu-elf
@dirrm zpu/libexec/gcc
@dirrm zpu/libexec
- at dirrm zpu/include
- at dirrmtry zpu/man/man1
- at dirrmtry zpu/man/man7
- at dirrmtry zpu/man
- at dirrmtry zpu
+ at dirrm zpu/lib/gcc/zpu-elf/3.4.2/install-tools/include
+ at dirrm zpu/lib/gcc/zpu-elf/3.4.2/install-tools
+ at dirrm zpu/lib/gcc/zpu-elf/3.4.2/include
+ at dirrm zpu/lib/gcc/zpu-elf/3.4.2
+ at dirrm zpu/lib/gcc/zpu-elf
+ at dirrm zpu/lib/gcc
+ at dirrm info/zpuc
More information about the svn-ports-all
mailing list