pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Make all gcc3-* packages use a single distinfo fi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/752ae809aa05
branches: trunk
changeset: 472427:752ae809aa05
user: seb <seb%pkgsrc.org@localhost>
date: Sat Apr 10 15:47:08 2004 +0000
description:
Make all gcc3-* packages use a single distinfo file from gcc3/distinfo and
a single patch directory from gcc3/patches/.
Also Move gcc3-c/{Makefile.common,language.mk} into gcc3/.
diffstat:
lang/gcc3-ada/Makefile | 4 +-
lang/gcc3-ada/distinfo | 10 ---
lang/gcc3-ada/patches/patch-aa | 17 -----
lang/gcc3-ada/patches/patch-ad | 13 ----
lang/gcc3-ada/patches/patch-ae | 44 --------------
lang/gcc3-ada/patches/patch-af | 13 ----
lang/gcc3-ada/patches/patch-ag | 22 -------
lang/gcc3-ada/patches/patch-ah | 36 -----------
lang/gcc3-c++/Makefile | 6 +-
lang/gcc3-c++/distinfo | 7 --
lang/gcc3-c++/patches/patch-aa | 15 ----
lang/gcc3-c++/patches/patch-af | 18 -----
lang/gcc3-c++/patches/patch-ag | 13 ----
lang/gcc3-c/Makefile | 8 +-
lang/gcc3-c/Makefile.common | 117 -------------------------------------
lang/gcc3-c/distinfo | 9 --
lang/gcc3-c/language.mk | 14 ----
lang/gcc3-c/patches/patch-ab | 12 ---
lang/gcc3-c/patches/patch-ae | 9 --
lang/gcc3-c/patches/patch-af | 18 -----
lang/gcc3-c/patches/patch-ag | 13 ----
lang/gcc3-c/patches/patch-ai | 13 ----
lang/gcc3-f77/Makefile | 4 +-
lang/gcc3-f77/distinfo | 5 -
lang/gcc3-f77/patches/patch-aa | 17 -----
lang/gcc3-java/Makefile | 4 +-
lang/gcc3-java/distinfo | 5 -
lang/gcc3-java/patches/patch-aa | 28 --------
lang/gcc3-objc/Makefile | 4 +-
lang/gcc3-objc/distinfo | 5 -
lang/gcc3-objc/patches/patch-aa | 17 -----
lang/gcc3/Makefile | 3 +-
lang/gcc3/Makefile.common | 125 ++++++++++++++++++++++++++++++++++++++++
lang/gcc3/distinfo | 15 ++++
lang/gcc3/language.mk | 14 ++++
lang/gcc3/patches/patch-aa | 28 ++++++++
lang/gcc3/patches/patch-ab | 12 +++
lang/gcc3/patches/patch-ae | 9 ++
lang/gcc3/patches/patch-af | 18 +++++
lang/gcc3/patches/patch-ag | 13 ++++
lang/gcc3/patches/patch-ai | 13 ++++
lang/gcc3/patches/patch-aj | 13 ++++
lang/gcc3/patches/patch-ak | 44 ++++++++++++++
lang/gcc3/patches/patch-al | 13 ++++
lang/gcc3/patches/patch-am | 22 +++++++
lang/gcc3/patches/patch-an | 36 +++++++++++
46 files changed, 395 insertions(+), 503 deletions(-)
diffs (truncated from 1158 to 300 lines):
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/Makefile
--- a/lang/gcc3-ada/Makefile Sat Apr 10 14:15:24 2004 +0000
+++ b/lang/gcc3-ada/Makefile Sat Apr 10 15:47:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/02/01 14:05:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/10 15:47:08 seb Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
COMMENT= GNU Compiler Collection, v3 - Ada compiler
@@ -6,7 +6,7 @@
INFO_FILES= gnat_ug_unx.info gnat_ug_vms.info gnat_ug_vxw.info
INFO_FILES+= gnat_ug_wnt.info gnat_rm.info gnat-style.info
-.include "../gcc3-c/language.mk"
+.include "../../lang/gcc3/language.mk"
PTHREAD_OPTS+= require native
CONFIGURE_ARGS+= --enable-languages="ada"
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/distinfo
--- a/lang/gcc3-ada/distinfo Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.9 2004/03/02 14:46:33 drochner Exp $
-
-SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
-Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
-SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
-SHA1 (patch-ad) = 80fead3fdfba3f93a89a7294b45f9633454d35fb
-SHA1 (patch-ae) = 9df2be9ed9f92218efce073ed0a727c0311630d0
-SHA1 (patch-af) = 6294061358e2b618a980e77cbf7bad6231feacbe
-SHA1 (patch-ag) = 8eff72d76b135a9b0318de651341cb08976758b5
-SHA1 (patch-ah) = c0795339102b4608a3813c3a2d488c71ea972d6f
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-aa
--- a/lang/gcc3-ada/patches/patch-aa Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/08 15:04:54 drochner Exp $
-
---- Makefile.in.orig 2003-05-14 02:18:14.000000000 +0200
-+++ Makefile.in 2003-07-03 18:02:24.000000000 +0200
-@@ -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 -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-ad
--- a/lang/gcc3-ada/patches/patch-ad Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/07/06 12:15:05 drochner Exp $
-
---- gcc/ada/Make-lang.in.orig 2003-07-06 11:48:22.000000000 +0200
-+++ gcc/ada/Make-lang.in 2003-07-06 11:48:44.000000000 +0200
-@@ -210,7 +210,7 @@
- $(LIBIBERTY) $(LIBS) $(SYSLIBS)
-
- # use target-gcc target-gnatmake target-gnatbind target-gnatlink
--gnattools: $(GCC_PARTS) $(CONFIG_H) prefix.o force
-+gnattools: $(CONFIG_H) prefix.o force
- $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \
- ADA_INCLUDES="-I- -I../rts"\
- CC="../../xgcc -B../../" STAGE_PREFIX=../../ gnattools1
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-ae
--- a/lang/gcc3-ada/patches/patch-ae Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/12/08 18:33:53 drochner Exp $
-
---- gcc/ada/Makefile.in.orig 2003-07-04 13:53:53.000000000 -0600
-+++ gcc/ada/Makefile.in
-@@ -1028,6 +1028,30 @@ ifeq ($(strip $(filter-out cygwin32% min
- EXTRA_GNATRTL_NONTASKING_OBJS = g-regist.o
- endif
-
-+ifeq ($(strip $(filter-out %86 netbsdelf%,$(arch) $(osys))),)
-+ LIBGNAT_TARGET_PAIRS = \
-+ a-numaux.adb<86numaux.adb \
-+ a-numaux.ads<86numaux.ads \
-+ a-intnam.ads<4netbsdintnam.ads \
-+ s-inmaop.adb<7sinmaop.adb \
-+ s-intman.adb<5netbsdintman.adb \
-+ s-mastop.adb<5omastop.adb \
-+ s-osinte.adb<5netbsdosinte.adb \
-+ s-osinte.ads<5netbsdosinte.ads \
-+ s-osprim.adb<5posprim.adb \
-+ s-parame.adb<5netbsdparame.adb \
-+ s-taprop.adb<5netbsdtaprop.adb \
-+ s-tasinf.ads<5ftasinf.ads \
-+ s-taspri.ads<7staspri.ads \
-+ s-tpopse.adb<5netbsdtpopse.adb \
-+ s-tpopsp.adb<7netbsdtpopsp.adb \
-+ system.ads<5netbsdsystem.ads
-+
-+ THREADSLIB=-pthread
-+ EXTRA_GNATRTL_TASKING_OBJS=adasignal.o ada_lwp_self.o
-+
-+endif
-+
- # The runtime library for gnat comprises two directories. One contains the
- # Ada source files that the compiler (gnat1) needs -- these files are listed
- # by ADA_INCLUDE_SRCS -- and the other contains the object files and their
-@@ -1609,7 +1633,7 @@ gnattools2: ../stamp-tools
- TOOLSCASE=native \
- ../../gnatchop$(exeext) ../../gnat$(exeext) ../../gnatkr$(exeext) \
- ../../gnatls$(exeext) ../../gnatprep$(exeext) \
-- ../../gnatpsta$(exeext) ../../gnatxref$(exeext) \
-+ ../../gnatxref$(exeext) \
- ../../gnatfind$(exeext) ../../gnatname$(exeext)
-
- # These tools are only built for the native version.
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-af
--- a/lang/gcc3-ada/patches/patch-af Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/12/08 18:33:53 drochner Exp $
-
---- gcc/ada/cstreams.c.orig 2003-12-01 15:24:51.000000000 -0700
-+++ gcc/ada/cstreams.c
-@@ -180,7 +180,7 @@ __gnat_full_name (nam, buffer)
- #elif defined (MSDOS)
- _fixpath (nam, buffer);
-
--#elif defined (sgi)
-+#elif defined (sgi) || defined (__NetBSD__)
-
- /* Use realpath function which resolves links and references to .. and ..
- on those Unix systems that support it. Note that GNU/Linux provides it but
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-ag
--- a/lang/gcc3-ada/patches/patch-ag Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/12/08 18:42:23 drochner Exp $
-
---- gcc/ada/adaint.c.orig 2002-11-18 07:39:46.000000000 -0700
-+++ gcc/ada/adaint.c
-@@ -636,6 +636,8 @@ __gnat_open_new_temp (path, fmode)
- return mkstemp (path);
- #elif defined (__Lynx__)
- mktemp (path);
-+#elif defined(__NetBSD__)
-+ return mkstemp (path);
- #else
- if (mktemp (path) == NULL)
- return -1;
-@@ -703,7 +705,7 @@ __gnat_tmp_name (tmp_filename)
- free (pname);
- }
-
--#elif defined (linux)
-+#elif defined (linux) || defined (__NetBSD__)
- char *tmpdir = getenv ("TMPDIR");
-
- if (tmpdir == NULL)
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-ada/patches/patch-ah
--- a/lang/gcc3-ada/patches/patch-ah Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/12/08 18:42:23 drochner Exp $
-
---- gcc/ada/i-cstrea.ads.orig 2002-10-23 01:33:26.000000000 -0600
-+++ gcc/ada/i-cstrea.ads
-@@ -179,9 +179,6 @@ package Interfaces.C_Streams is
-
- function isatty (handle : int) return int;
-
-- procedure mktemp (template : chars);
-- -- The return value (which is just a pointer to template) is discarded
--
- procedure rewind (stream : FILEs);
-
- function setvbuf
-@@ -191,11 +188,6 @@ package Interfaces.C_Streams is
- size : size_t)
- return int;
-
-- procedure tmpnam (string : chars);
-- -- The parameter must be a pointer to a string buffer of at least L_tmpnam
-- -- bytes (the call with a null parameter is not supported). The returned
-- -- value, which is just a copy of the input argument, is discarded.
--
- function tmpfile return FILEs;
-
- function ungetc (c : int; stream : FILEs) return int;
-@@ -270,9 +262,7 @@ private
- pragma Import (C, fseek);
- pragma Import (C, ftell);
- pragma Import (C, isatty);
-- pragma Import (C, mktemp);
- pragma Import (C, rewind);
-- pragma Import (C, tmpnam);
- pragma Import (C, tmpfile);
- pragma Import (C, ungetc);
- pragma Import (C, unlink);
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c++/Makefile
--- a/lang/gcc3-c++/Makefile Sat Apr 10 14:15:24 2004 +0000
+++ b/lang/gcc3-c++/Makefile Sat Apr 10 15:47:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/02 14:46:33 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/10 15:47:09 seb Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
COMMENT= GNU Compiler Collection, v3 - C++ compiler
@@ -6,10 +6,12 @@
INSTLIBS= libstdc++-v3/libsupc++/libsupc++.la \
libstdc++-v3/src/libstdc++.la
-.include "../gcc3-c/language.mk"
+.include "../../lang/gcc3/language.mk"
CONFIGURE_ARGS+= --enable-languages="c++"
+MAKE_ENV+= ALL_GCC_CXX=${ALL_GCC_CXX:Q}
+
do-build:
cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} c++
cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} g++
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c++/distinfo
--- a/lang/gcc3-c++/distinfo Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.7 2004/03/02 14:46:33 drochner Exp $
-
-SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
-Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
-SHA1 (patch-aa) = 93a4299e7d64b91f750ba96c75f0487cdf87abea
-SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
-SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c++/patches/patch-aa
--- a/lang/gcc3-c++/patches/patch-aa Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/08 15:05:00 drochner Exp $
-
---- Makefile.in.orig 2003-05-14 02:18:14.000000000 +0200
-+++ Makefile.in 2003-07-03 23:14:35.000000000 +0200
-@@ -1642,8 +1642,8 @@
-
- install-dosrel-fake:
-
--ALL_GCC = all-gcc
--ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
-+#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.
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c++/patches/patch-af
--- a/lang/gcc3-c++/patches/patch-af Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/29 09:02:51 martin Exp $
-
---- gcc/cppspec.c Wed Jul 23 02:40:54 2003
-+++ gcc/cppspec.c Fri Jul 25 17:57:41 2003
-@@ -85,6 +85,13 @@
-
- is_cpp_driver = 1;
-
-+ /* NetBSD uses __GNUC__ and friends in header files processed with cpp
-+ regularly. Default to old behaviour here. XXX - move me to
-+ config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC". */
-+#ifdef DEFAULT_CPP_NEED_NO_GCC
-+ need_no_gcc = DEFAULT_CPP_NEED_NO_GCC;
-+#endif
-+
- /* First pass. If we see an -S or -c, barf. If we see an input file,
- turn off read_stdin. If we see a second input file, it is actually
- the output file. If we see a third input file, barf. */
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c++/patches/patch-ag
--- a/lang/gcc3-c++/patches/patch-ag Sat Apr 10 14:15:24 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/07/29 09:02:51 martin Exp $
-
-Index: gcc/config/netbsd.h
---- gcc/config/netbsd.h Wed Jul 23 02:41:37 2003
-+++ gcc/config/netbsd.h Fri Jul 25 17:57:43 2003
-@@ -234,3 +234,7 @@
- /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
- (void) mprotect (page, end - page, 7); \
- }
-+
-+/* NetBSD depends on "cpp" having GNUC semantics, and must default as if
-+ "cpp -gcc" was called. */
-+#define DEFAULT_CPP_NEED_NO_GCC 0
diff -r 0ab66e4b3342 -r 752ae809aa05 lang/gcc3-c/Makefile
--- a/lang/gcc3-c/Makefile Sat Apr 10 14:15:24 2004 +0000
+++ b/lang/gcc3-c/Makefile Sat Apr 10 15:47:08 2004 +0000
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/10 15:47:08 seb Exp $
Home |
Main Index |
Thread Index |
Old Index