Tue Dec 10 11:44:47 2013 UTC ()
Fix relocation errors on OSX.


(jperkin)
diff -r1.19 -r1.20 pkgsrc/lang/g95/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/lang/g95/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/g95/Makefile 2013/09/20 23:06:07 1.19
+++ pkgsrc/lang/g95/Makefile 2013/12/10 11:44:47 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2013/09/20 23:06:07 joerg Exp $ 1# $NetBSD: Makefile,v 1.20 2013/12/10 11:44:47 jperkin Exp $
2 2
3DISTNAME= g95_source 3DISTNAME= g95_source
4PKGNAME= g95-0.93 4PKGNAME= g95-0.93
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/ 7MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2 9DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2
10SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/} 10SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/}
11 11
12MAINTAINER= wennmach@NetBSD.org 12MAINTAINER= wennmach@NetBSD.org
13HOMEPAGE= http://www.g95.org/ 13HOMEPAGE= http://www.g95.org/
14COMMENT= Fortran 95 compiler from g95.org 14COMMENT= Fortran 95 compiler from g95.org
@@ -19,26 +19,29 @@ USE_LIBTOOL= yes @@ -19,26 +19,29 @@ USE_LIBTOOL= yes
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR} 20CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR}
21WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 21WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
22PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} 22PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q}
23 23
24GCC_VER= 4.1.2 24GCC_VER= 4.1.2
25GCC_DIR= ${WRKDIR}/gcc-${GCC_VER} 25GCC_DIR= ${WRKDIR}/gcc-${GCC_VER}
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
30GCC_CONFIGURE_ARGS+= --disable-multilib 30GCC_CONFIGURE_ARGS+= --disable-multilib
31 31
 32# Avoid "ld: illegal text-relocation to half in .libs/x87.o"
 33LDFLAGS.Darwin+= -Wl,-read_only_relocs,suppress
 34
32.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
33.if ${OPSYS} == "SunOS" 36.if ${OPSYS} == "SunOS"
34GCC_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump 37GCC_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
35GCC_CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld 38GCC_CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
36. if !exists(/usr/sfw/bin/gas) 39. if !exists(/usr/sfw/bin/gas)
37GCC_CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as 40GCC_CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
38. else 41. else
39GCC_CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas 42GCC_CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
40. endif 43. endif
41.endif 44.endif
42 45
43post-extract: 46post-extract:
44 ${MKDIR} ${GCC_G95_DIR} 47 ${MKDIR} ${GCC_G95_DIR}