tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cwrapper fixes during freeze



Hi,

I'd like to commit the small changes below.  They fix a number of
issues seen in SunOS bulk builds (gfortran calls not going via the
wrappers and '-mt' being transformed to the invalid '-threads'), are
confined to USE_CWRAPPERS=yes which is not currently the default, and
should cause no regressions.

However they do touch mk/ and pkgtools/ during the freeze, so I'd like
approval and a sanity check prior to doing so.

Thanks!

Index: mk/cwrappers.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/cwrappers.mk,v
retrieving revision 1.21
diff -u -r1.21 cwrappers.mk
--- mk/cwrappers.mk	15 Mar 2015 19:23:26 -0000	1.21
+++ mk/cwrappers.mk	17 Mar 2015 13:15:42 -0000
@@ -29,7 +29,7 @@
 CWRAPPERS_ALIASES.cc=		cc gcc clang
 CWRAPPERS_ALIASES.cxx=		c++ g++ cxx clang++
 CWRAPPERS_ALIASES.cpp=		cpp clang-cpp
-CWRAPPERS_ALIASES.f77=		f77 g77
+CWRAPPERS_ALIASES.f77=		f77 g77 gfortran
 CWRAPPERS_ALIASES.imake=	imake
 CWRAPPERS_ALIASES.ld=		ld
 CWRAPPERS_ALIASES.libtool=	libtool
Index: pkgtools/cwrappers/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/cwrappers/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- pkgtools/cwrappers/Makefile	15 Mar 2015 19:16:45 -0000	1.7
+++ pkgtools/cwrappers/Makefile	17 Mar 2015 13:15:42 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.7 2015/03/15 19:16:45 joerg Exp $
 
-PKGNAME=		cwrappers-20150314
+PKGNAME=		cwrappers-20150317
 CATEGORIES=		pkgtools sysutils
 
 MAINTAINER=		joerg%NetBSD.org@localhost
Index: pkgtools/cwrappers/files/bin/transform-gcc.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/cwrappers/files/bin/transform-gcc.c,v
retrieving revision 1.1
diff -u -r1.1 transform-gcc.c
--- pkgtools/cwrappers/files/bin/transform-gcc.c	17 Sep 2014 12:40:56 -0000	1.1
+++ pkgtools/cwrappers/files/bin/transform-gcc.c	17 Mar 2015 13:15:42 -0000
@@ -143,7 +143,7 @@
 	{ "-kpic", 5, transform_replace, "-fPIC" },
 	{ "-KPIC", 5, transform_replace, "-fPIC" },
 	{ "-kPIC", 5, transform_replace, "-fPIC" },
-	{ "-mt", 3, transform_replace, "-threads" },
+	{ "-mt", 3, transform_discard, NULL },
 	{ "-64", 3, transform_replace, "-m64" },
 };

-- 
Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com


Home | Main Index | Thread Index | Old Index