diff options
author | seb <seb@pkgsrc.org> | 2004-04-10 15:47:08 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2004-04-10 15:47:08 +0000 |
commit | e191a664a9772e2edd257cb3d81d0e8f3c3fa2b9 (patch) | |
tree | 5cffc6a665f288bd7381afc1197c247bd6a82fa2 /lang/gcc3-ada | |
parent | 2f9225c02c09f9842ddb844bbfc4e221cdf40391 (diff) | |
download | pkgsrc-e191a664a9772e2edd257cb3d81d0e8f3c3fa2b9.tar.gz |
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 (limited to 'lang/gcc3-ada')
-rw-r--r-- | lang/gcc3-ada/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc3-ada/distinfo | 10 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-aa | 17 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-ad | 13 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-ae | 44 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-af | 13 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-ag | 22 | ||||
-rw-r--r-- | lang/gcc3-ada/patches/patch-ah | 36 |
8 files changed, 2 insertions, 157 deletions
diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile index cd899da6a6b..b9a6db0e232 100644 --- a/lang/gcc3-ada/Makefile +++ b/lang/gcc3-ada/Makefile @@ -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 @@ COMMENT= GNU Compiler Collection, v3 - Ada compiler 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 --git a/lang/gcc3-ada/distinfo b/lang/gcc3-ada/distinfo deleted file mode 100644 index 4e00848ea6b..00000000000 --- a/lang/gcc3-ada/distinfo +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-aa b/lang/gcc3-ada/patches/patch-aa deleted file mode 100644 index f448803207a..00000000000 --- a/lang/gcc3-ada/patches/patch-aa +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-ad b/lang/gcc3-ada/patches/patch-ad deleted file mode 100644 index ffed85a8423..00000000000 --- a/lang/gcc3-ada/patches/patch-ad +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-ae b/lang/gcc3-ada/patches/patch-ae deleted file mode 100644 index 76292482619..00000000000 --- a/lang/gcc3-ada/patches/patch-ae +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-af b/lang/gcc3-ada/patches/patch-af deleted file mode 100644 index 3169e0e7f3a..00000000000 --- a/lang/gcc3-ada/patches/patch-af +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-ag b/lang/gcc3-ada/patches/patch-ag deleted file mode 100644 index 4c9410f9457..00000000000 --- a/lang/gcc3-ada/patches/patch-ag +++ /dev/null @@ -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 --git a/lang/gcc3-ada/patches/patch-ah b/lang/gcc3-ada/patches/patch-ah deleted file mode 100644 index 643d95c53d2..00000000000 --- a/lang/gcc3-ada/patches/patch-ah +++ /dev/null @@ -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); |