summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorshannonjr <shannonjr@pkgsrc.org>2004-07-28 21:30:19 +0000
committershannonjr <shannonjr@pkgsrc.org>2004-07-28 21:30:19 +0000
commita56bf6f82c97b2baa82424aa5bb0494ec8e688ef (patch)
treefcde76b62721284f2ac5ff11424ac0a06b39264b /lang
parent75d24b940081ca3f9663bc1664140fec810b8225 (diff)
downloadpkgsrc-a56bf6f82c97b2baa82424aa5bb0494ec8e688ef.tar.gz
1) Fixed two Ada bootstrap issues reported by Matthias Drochner:
a) The BUILD_ADA must be YES (strictly capitalized) for the pre-configure target to work, which is inconsistent. b) For me (using ALT_GCC), the directory .work/.gcc was not present at pre-configure time, which made some "cd" fail. 2) Makefile cleanup as recommended by Lubomir. 3) pkglint cleanup 4) Increment PKGREVISION
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc34/Makefile20
-rw-r--r--lang/gcc34/buildlink3.mk4
-rw-r--r--lang/gcc34/files/netbsd64macro.dfs1
-rw-r--r--lang/gcc34/preconfigure.mk2
4 files changed, 13 insertions, 14 deletions
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index b47072eeb70..4a5eb87ff81 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/07/28 12:14:49 shannonjr Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/28 21:30:19 shannonjr Exp $
#
DISTNAME= gcc-${GCC_VERSION}
PKGNAME= gcc34-${GCC_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
EXTRACT_SUFX= .tar.bz2
@@ -130,8 +130,7 @@ MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
CPPFLAGS+= -I${BUILDLINK_DIR}/include
CFLAGS+= -I${BUILDLINK_DIR}/include
-LOWER_OPSYS_VERSUFFIX!= echo ${LOWER_OS_VERSION} | ${CUT} -d _ -f 1
-GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
+GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/_.*//}
CONFIGURE_ARGS+= --host=${GCC_PLATFORM}
GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION}
GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR}
@@ -154,23 +153,24 @@ post-patch:
${CP} $$i ${WRKSRC}/gcc/ada; \
done )
-.if ${BUILD_ADA} == "YES"
+.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
. if defined(USE_GCC34ADA)
# Overide compiler.mk setup to use gcc-3.4.x-ada
pre-configure:
.include "../../lang/gcc34-ada/preconfigure.mk"
. elif defined(ALT_GCC)
pre-configure:
+ (${TEST} -d ${WRKDIR}/.gcc/bin/ || ${MKDIR} ${WRKDIR}/.gcc/bin/)
(cd ${WRKDIR}/.buildlink && ${MKDIR} ${RALT_GCC_RTS} && \
cd ${RALT_GCC_RTS} && ${LN} -sf ${ALT_GCC_RTS}/libgnat.a .)
(cd ${ALT_GCC:H} && \
bin_files=`${FIND} . -type f \( -perm -0100 \)` && \
cd ${WRKDIR}/.gcc/bin/ && \
for filename in ${ALT_GCC:T} $${bin_files} ; do \
- $(ECHO) '#!/bin/sh' > $${filename}; \
- $(ECHO) -n "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
- $(ECHO) '"$$@"' >>$${filename}; \
- $(CHMOD) +x $${filename}; \
+ ${ECHO} '#!${TOOLS_SHELL}' > $${filename}; \
+ ${ECHO} -n "exec ${ALT_GCC:H}/$${filename} " >>$${filename}; \
+ ${ECHO} '"$$@"' >>$${filename}; \
+ ${CHMOD} +x $${filename}; \
done )
. endif
.endif
@@ -187,7 +187,7 @@ do-build:
do-test:
.if (${MACHINE_GNU_ARCH} == "x86_64")
- (cd files && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs)
+ (cd ${FILESDIR} && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs)
.endif
(cd ${WRKDIR}/obj && ${GMAKE} -k check)
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index 2461cc7149a..3efde3345b6 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/28 07:37:19 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/07/28 21:30:19 shannonjr Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC34_BUILDLINK3_MK:= ${GCC34_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34}
BUILDLINK_PACKAGES+= gcc34
.if !empty(GCC34_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc34+= gcc34>=3.4.1nb2
+BUILDLINK_DEPENDS.gcc34+= gcc34>=3.4.1nb3
BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34
. if exists(${BUILDLINK_PREFIX.gcc34}/bin/gcc)
_GNAT1!=${BUILDLINK_PREFIX.gcc34}/bin/gcc -print-prog-name=gnat1
diff --git a/lang/gcc34/files/netbsd64macro.dfs b/lang/gcc34/files/netbsd64macro.dfs
index 09eec72d054..7c1c844a96a 100644
--- a/lang/gcc34/files/netbsd64macro.dfs
+++ b/lang/gcc34/files/netbsd64macro.dfs
@@ -298,4 +298,3 @@ VARIABLE_ADDRESS1 VAR_ADDR1
-- THE MACROS $VARIABLE_ADDRESS AND $VARIABLE_ADDRESS1.
-- USED IN: SPPRT13SP
VARIABLE_ADDRESS2 VAR_ADDR2
-
diff --git a/lang/gcc34/preconfigure.mk b/lang/gcc34/preconfigure.mk
index 4a76c506319..5b7dd6330ae 100644
--- a/lang/gcc34/preconfigure.mk
+++ b/lang/gcc34/preconfigure.mk
@@ -1,6 +1,6 @@
# Create compiler driver scripts in ${WRKDIR}.
(test -d ${WRKDIR}/.gcc/bin || ${MKDIR} ${WRKDIR}/.gcc/bin)
- (cd ${BUILDLINK_PREFIX.gcc34}/bin && bin_files=`ls *` && \
+ (cd ${BUILDLINK_PREFIX.gcc34}/bin && bin_files=`${LS} *` && \
cd ${WRKDIR}/.gcc/bin && \
for _target_ in $${bin_files} ; do \
${ECHO} '#!${TOOLS_SHELL}' > $${_target_} && \