summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshannonjr <shannonjr@pkgsrc.org>2004-10-30 12:06:59 +0000
committershannonjr <shannonjr@pkgsrc.org>2004-10-30 12:06:59 +0000
commitbedf3290f5a02ba32753cf346dd34b7c6c6fccc9 (patch)
tree78034d59cd3c008e88dedfa73dff9cde0635ee9d
parentc4d73a2d67e583401afb52ca4f5c396173ad9f36 (diff)
downloadpkgsrc-bedf3290f5a02ba32753cf346dd34b7c6c6fccc9.tar.gz
Revised to build dynamic (in addition to static) libgnat if Ada language
frontend is built.
-rw-r--r--lang/gcc34/Makefile3
-rw-r--r--lang/gcc34/distinfo4
-rw-r--r--lang/gcc34/patches/patch-ae8
3 files changed, 10 insertions, 5 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 416c8b62a1f..43946d8e5d7 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/09/21 13:32:40 shannonjr Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/30 12:06:59 shannonjr Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -192,6 +192,7 @@ do-configure:
do-build:
(cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} bootstrap)
.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
+ (cd ${WRKDIR}/obj/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib-shared)
(cd ${WRKDIR}/obj/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} gnatlib_and_tools)
.endif
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 8429a637302..405b77241af 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/09/21 13:32:40 shannonjr Exp $
+$NetBSD: distinfo,v 1.11 2004/10/30 12:06:59 shannonjr Exp $
SHA1 (gcc-3.4.2.tar.bz2) = 1f3fda2c8aa331ebc20bbe5020e658d4137be4fd
Size (gcc-3.4.2.tar.bz2) = 27246826 bytes
-SHA1 (patch-ae) = 0a12deda859c553eda6b877779525e391451021a
+SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192
SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
SHA1 (patch-ah) = 3b3471f42e801f8588c1e0959d5cfa704ce16a3e
diff --git a/lang/gcc34/patches/patch-ae b/lang/gcc34/patches/patch-ae
index 5f54a858a70..e7dfbee42f5 100644
--- a/lang/gcc34/patches/patch-ae
+++ b/lang/gcc34/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2004/07/30 14:37:45 shannonjr Exp $
+$NetBSD: patch-ae,v 1.3 2004/10/30 12:06:59 shannonjr Exp $
--- gcc/ada/Makefile.in.orig 2004-01-26 14:57:32.000000000 -0700
+++ gcc/ada/Makefile.in
-@@ -1292,6 +1292,54 @@ ifeq ($(strip $(filter-out %x86_64 linux
+@@ -1292,6 +1292,58 @@ ifeq ($(strip $(filter-out %x86_64 linux
LIBRARY_VERSION := $(LIB_VERSION)
endif
@@ -27,6 +27,8 @@ $NetBSD: patch-ae,v 1.2 2004/07/30 14:37:45 shannonjr Exp $
+
+ THREADSLIB=-pthread
+ EXTRA_GNATRTL_TASKING_OBJS=adasignal.o ada_lwp_self.o dummy_pthreads.o
++ GNATLIB_SHARED=gnatlib-shared-dual
++ LIBRARY_VERSION := $(LIB_VERSION)
+
+endif
+
@@ -50,6 +52,8 @@ $NetBSD: patch-ae,v 1.2 2004/07/30 14:37:45 shannonjr Exp $
+
+ THREADSLIB=-pthread
+ EXTRA_GNATRTL_TASKING_OBJS=adasignal.o ada_lwp_self.o dummy_pthreads.o
++ GNATLIB_SHARED=gnatlib-shared-dual
++ LIBRARY_VERSION := $(LIB_VERSION)
+
+endif
+