diff options
author | drochner <drochner> | 2003-07-06 12:15:03 +0000 |
---|---|---|
committer | drochner <drochner> | 2003-07-06 12:15:03 +0000 |
commit | 8ca23bf02ea21925aea9d6cbca5a0ce1e67a1428 (patch) | |
tree | 90757239cbac9281a1efbec2ae6d03efee333d33 /lang/gcc3-f77/patches | |
parent | 4157f971bf6021fa77784b9310150ec67ec4c56a (diff) | |
download | pkgsrc-8ca23bf02ea21925aea9d6cbca5a0ce1e67a1428.tar.gz |
Split the gcc3 pkg into per-language pieces.
Needs some cleanup and integration; eventually lang/gcc3 can turn into
a meta-pkg.
Diffstat (limited to 'lang/gcc3-f77/patches')
-rw-r--r-- | lang/gcc3-f77/patches/patch-aa | 34 | ||||
-rw-r--r-- | lang/gcc3-f77/patches/patch-ab | 37 | ||||
-rw-r--r-- | lang/gcc3-f77/patches/patch-ac | 30 |
3 files changed, 101 insertions, 0 deletions
diff --git a/lang/gcc3-f77/patches/patch-aa b/lang/gcc3-f77/patches/patch-aa new file mode 100644 index 00000000000..3cf1ed3d249 --- /dev/null +++ b/lang/gcc3-f77/patches/patch-aa @@ -0,0 +1,34 @@ +$NetBSD: patch-aa,v 1.1 2003/07/06 12:15:11 drochner Exp $ + +--- Makefile.in.orig 2003-05-14 02:18:14.000000000 +0200 ++++ Makefile.in 2003-07-03 18:02:24.000000000 +0200 +@@ -153,11 +153,11 @@ + + # For an installed makeinfo, we require it to be from texinfo 4.2 or + # higher, else we use the "missing" dummy. +-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ +- then echo $$r/texinfo/makeinfo/makeinfo ; \ +- else if (makeinfo --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ +- then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` ++#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ ++# then echo $$r/texinfo/makeinfo/makeinfo ; \ ++# else if (makeinfo --version \ ++# | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ ++# then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` + + # This just becomes part of the MAKEINFO definition passed down to + # sub-makes. It lets flags be given on the command line while still +@@ -1642,9 +1642,9 @@ + + install-dosrel-fake: + +-ALL_GCC = all-gcc +-ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss +-ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3 ++#ALL_GCC = all-gcc ++#ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss ++#ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3 + + # This is a list of inter-dependencies among modules. + all-ash: diff --git a/lang/gcc3-f77/patches/patch-ab b/lang/gcc3-f77/patches/patch-ab new file mode 100644 index 00000000000..4b206dfb665 --- /dev/null +++ b/lang/gcc3-f77/patches/patch-ab @@ -0,0 +1,37 @@ +$NetBSD: patch-ab,v 1.1 2003/07/06 12:15:11 drochner Exp $ + +--- gcc/Makefile.in.orig 2003-04-22 17:50:48.000000000 +0200 ++++ gcc/Makefile.in 2003-07-03 17:21:34.000000000 +0200 +@@ -617,8 +617,8 @@ + + # Build and host support libraries. FORBUILD is either + # .. or ../$(build_alias) depending on whether host != build. +-LIBIBERTY = ../libiberty/libiberty.a +-BUILD_LIBIBERTY = @FORBUILD@/libiberty/libiberty.a ++LIBIBERTY = ${prefix}/lib/libiberty.a ++BUILD_LIBIBERTY = ${prefix}/lib/libiberty.a + + # Dependencies on the intl and portability libraries. + LIBDEPS= $(INTLDEPS) $(LIBIBERTY) +@@ -1273,6 +1273,7 @@ + # Language-independent files. + + DRIVER_DEFINES = \ ++ -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(GCC_PREFIX)/lib\"" \ + -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ +@@ -2874,11 +2875,11 @@ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ + done; \ + else true; fi +- -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ ++ -if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \ + if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ + for f in cpp.info gcc.info gccint.info cppinternals.info; do \ + if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ +- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ ++ ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ + else true; fi; \ + done; \ + else true; fi; \ diff --git a/lang/gcc3-f77/patches/patch-ac b/lang/gcc3-f77/patches/patch-ac new file mode 100644 index 00000000000..5e603afdf17 --- /dev/null +++ b/lang/gcc3-f77/patches/patch-ac @@ -0,0 +1,30 @@ +$NetBSD: patch-ac,v 1.1 2003/07/06 12:15:11 drochner Exp $ + +--- gcc/f/Make-lang.in.orig Sat May 24 12:59:15 2003 ++++ gcc/f/Make-lang.in Sat May 24 13:00:08 2003 +@@ -277,9 +277,9 @@ + chmod a-x $(DESTDIR)$(infodir)/g77.info*; \ + else true; fi + @if [ -f $(srcdir)/f/g77.info ] ; then \ +- if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ +- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ ++ if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ ++ echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ ++ ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ + else : ; fi; \ + else : ; fi + +@@ -297,9 +297,9 @@ + else true; fi + + f77.uninstall: installdirs +- if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ +- echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ +- install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ ++ if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ ++ echo " ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ ++ ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ + else : ; fi + rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \ |