Tue Mar 20 17:26:19 2012 UTC ()
Make sure that the gcc used for building g95 knows which ld/as/objdump
to use on SunOS (same as in lang/gcc46). Add PLIST.SunOS.


(hans)
diff -r1.8 -r1.9 pkgsrc/lang/g95/Makefile
diff -r0 -r1.1 pkgsrc/lang/g95/PLIST.SunOS
cvs diff -r1.8 -r1.9 pkgsrc/lang/g95/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/g95/Makefile 2011/01/23 09:42:10 1.8
+++ pkgsrc/lang/g95/Makefile 2012/03/20 17:26:19 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2011/01/23 09:42:10 markd Exp $ 1# $NetBSD: Makefile,v 1.9 2012/03/20 17:26:19 hans Exp $
2 2
3DISTNAME= g95_source 3DISTNAME= g95_source
4VERSION= 0.92 4VERSION= 0.92
5PKGNAME= g95-${VERSION} 5PKGNAME= g95-${VERSION}
6CATEGORIES= lang 6CATEGORIES= lang
7EXTRACT_SUFX.g95_source= .tgz 7EXTRACT_SUFX.g95_source= .tgz
8DIST_SUBDIR= ${PKGNAME_NOREV} 8DIST_SUBDIR= ${PKGNAME_NOREV}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX.g95_source} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX.g95_source}
10DISTFILES+= gcc-core-4.0.3.tar.gz 10DISTFILES+= gcc-core-4.0.3.tar.gz
11SITES.g95_source.tgz= http://ftp.g95.org/v0.92/ 11SITES.g95_source.tgz= http://ftp.g95.org/v0.92/
12SITES.gcc-core-4.0.3.tar.gz= ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.0.3/ 12SITES.gcc-core-4.0.3.tar.gz= ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.0.3/
13 13
14MAINTAINER= wennmach@NetBSD.org 14MAINTAINER= wennmach@NetBSD.org
@@ -18,26 +18,37 @@ COMMENT= Fortran 95 compiler from g95.o @@ -18,26 +18,37 @@ COMMENT= Fortran 95 compiler from g95.o
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20GNU_CONFIGURE= YES 20GNU_CONFIGURE= YES
21USE_TOOLS+= gmake gtar 21USE_TOOLS+= gmake gtar
22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
23PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} 23PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q}
24 24
25GCC_DIR= ${WRKDIR}/gcc-4.0.3 25GCC_DIR= ${WRKDIR}/gcc-4.0.3
26GCC_G95_DIR= ${GCC_DIR}/g95 26GCC_G95_DIR= ${GCC_DIR}/g95
27GCC_CONFIGURE_SCRIPT= ../configure 27GCC_CONFIGURE_SCRIPT= ../configure
28GCC_CONFIGURE_ARGS= ${CONFIGURE_ARGS} 28GCC_CONFIGURE_ARGS= ${CONFIGURE_ARGS}
29GCC_CONFIGURE_ARGS+= --enable-languages=c 29GCC_CONFIGURE_ARGS+= --enable-languages=c
30 30
 31.include "../../mk/bsd.prefs.mk"
 32.if ${OPSYS} == "SunOS"
 33GCC_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
 34GCC_CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
 35. if !exists(/usr/sfw/bin/gas)
 36GCC_CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
 37. else
 38GCC_CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
 39. endif
 40.endif
 41
31CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR} 42CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR}
32 43
33post-extract: 44post-extract:
34 ${MKDIR} ${GCC_G95_DIR} 45 ${MKDIR} ${GCC_G95_DIR}
35 cd ${WRKSRC} && ${GTAR} -xzf libf95.a-${VERSION}.tar.gz 46 cd ${WRKSRC} && ${GTAR} -xzf libf95.a-${VERSION}.tar.gz
36 47
37pre-configure: 48pre-configure:
38 rm -f ${GCC_DIR}/config.sub ${GCC_DIR}/config.guess 49 rm -f ${GCC_DIR}/config.sub ${GCC_DIR}/config.guess
39 ln -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${GCC_DIR}/config.sub 50 ln -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${GCC_DIR}/config.sub
40 ln -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${GCC_DIR}/config.guess 51 ln -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${GCC_DIR}/config.guess
41 cd ${GCC_G95_DIR} && ${GCC_CONFIGURE_SCRIPT} ${GCC_CONFIGURE_ARGS} && ${GMAKE} 52 cd ${GCC_G95_DIR} && ${GCC_CONFIGURE_SCRIPT} ${GCC_CONFIGURE_ARGS} && ${GMAKE}
42 53
43post-build: 54post-build:
File Added: pkgsrc/lang/g95/PLIST.SunOS
@comment $NetBSD: PLIST.SunOS,v 1.1 2012/03/20 17:26:19 hans Exp $
lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtbegin.o
lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/crtend.o
lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.0.3/gmon.o