CVS commit: [pkgsrc-2017Q3] pkgsrc/lang/g95

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Oct 19 17:56:46 UTC 2017

Modified Files:
        pkgsrc/lang/g95 [pkgsrc-2017Q3]: Makefile

Log Message:
Pullup ticket #5583 - requested by maya
lang/g95: Linux build fix

Revisions pulled up:
- lang/g95/Makefile                                             1.29

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Oct 18 09:38:23 UTC 2017

   Modified Files:
           pkgsrc/lang/g95: Makefile

   Log Message:
   g95: fix build on linux
   force passing asprintf test which is incorrectly not found due to FORTIFY
   pass LIBRARY_PATH so crtn.o and crti.o are found on Ubuntu & friends

   Note many reporters need to install g++-multilib as a package to overcome
   the errors they reported in the bugs (missing <sys/cdefs.h>)

   PR pkg/51198, PR pkg/51690, PR pkg/52116


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.6.1 pkgsrc/lang/g95/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/g95/Makefile
diff -u pkgsrc/lang/g95/Makefile:1.28 pkgsrc/lang/g95/Makefile:1.28.6.1
--- pkgsrc/lang/g95/Makefile:1.28       Wed Jun 21 01:12:56 2017
+++ pkgsrc/lang/g95/Makefile    Thu Oct 19 17:56:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/06/21 01:12:56 maya Exp $
+# $NetBSD: Makefile,v 1.28.6.1 2017/10/19 17:56:46 bsiegert Exp $
 
 DISTNAME=      g95_source
 PKGNAME=       g95-0.93
@@ -34,6 +34,15 @@ GCC_CONFIGURE_ARGS+= --disable-libssp # 
 LDFLAGS.Darwin+=       -Wl,-read_only_relocs,suppress
 
 .include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+.  if exists(/usr/lib/${MACHINE_ARCH}-linux-gnu)
+MAKE_ENV+=             LIBRARY_PATH=/usr/lib/${MACHINE_ARCH}-linux-gnu
+.  endif
+MAKE_ENV+=             ac_cv_have_decl_asprintf=yes
+USE_TOOLS+=            perl:build
+.endif
+
 .if ${OPSYS} == "SunOS"
 GCC_CONFIGURE_ENV+=    OBJDUMP=/usr/sfw/bin/gobjdump
 GCC_CONFIGURE_ARGS+=   --without-gnu-ld --with-ld=/usr/ccs/bin/ld
@@ -42,8 +51,6 @@ GCC_CONFIGURE_ARGS+=  --without-gnu-as --
 .  else
 GCC_CONFIGURE_ARGS+=   --with-gnu-as --with-as=/usr/sfw/bin/gas
 .  endif
-.elif ${OPSYS} == "Linux"
-USE_TOOLS+=    perl:build
 .endif
 
 post-extract: