kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Applied several changes from lang/gcc34:

Browse source 
1) Test and mkdir if necessary to correct problem reported by
   Matthias Drochner: "For me (using ALT_GCC), the directory .work/.gcc was
   not present at pre-configure time, which made some "cd" fail."
2) Makefile and pkglint cleanup as recommended by Lubomir Sedlacik
This commit is contained in:
shannonjr 2004-07-28 21:40:21 +00:00
parent 7a66444922
commit 41a56bdd8a
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lang/gcc34-ada/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.4 2004/07/28 12:04:08 shannonjr Exp $
# $NetBSD: Makefile,v 1.5 2004/07/28 21:40:21 shannonjr Exp $
#
DISTNAME= gcc-${GCC_VERSION}
PKGNAME= gcc34-ada-${GCC_VERSION}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
EXTRACT_SUFX= .tar.bz2
@ -86,8 +86,7 @@ GCC34_PKGMODIF= ${GCC34_INSTALLTO_SUBPREFIX}
GCC_SUBPREFIX= ${GCC34_INSTALLTO_SUBPREFIX}
GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
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}
@ -118,16 +117,17 @@ pre-configure:
.include "../../lang/gcc34/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} && \
files=`${FIND} . -type f \( -perm -0100 \)` && \
cd ${GCC_DIR}/bin/ && \
for file in ${ALT_GCC:T} $${files} ; do \
$(ECHO) '#!/bin/sh' > $${file}; \
$(ECHO) -n "exec ${ALT_GCC:H}/$${file} " >>$${file}; \
$(ECHO) '"$$@"' >>$${file}; \
$(CHMOD) +x $${file}; \
${ECHO} '#!${TOOLS_SHELL}' > $${file}; \
${ECHO} -n "exec ${ALT_GCC:H}/$${file} " >>$${file}; \
${ECHO} '"$$@"' >>$${file}; \
${CHMOD} +x $${file}; \
done )
.endif

4
lang/gcc34-ada/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.3 2004/07/28 12:04:08 shannonjr Exp $
# $NetBSD: buildlink3.mk,v 1.4 2004/07/28 21:40:21 shannonjr Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+
@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34-ada}
BUILDLINK_PACKAGES+= gcc34-ada
.if !empty(GCCADA_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb2
BUILDLINK_DEPENDS.gcc34-ada+= gcc34-ada>=3.4.1nb3
BUILDLINK_PKGSRCDIR.gcc34-ada?= ../../lang/gcc34-ada
BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc
. if exists(${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc)

1
lang/gcc34-ada/preconfigure.mk
View file

@ -1,4 +1,5 @@
# Create compiler driver scripts in ${WRKDIR}.
(test -d ${WRKDIR}/.gcc/bin || ${MKDIR} ${WRKDIR}/.gcc/bin)
(cd ${BUILDLINK_PREFIX.gcc34-ada}/bin && bin_files=`${FIND} . -type f \( -perm -0100 \)` && \
cd ${WRKDIR}/.gcc/bin && \
for _target_ in $${bin_files} ; do \