CVS commit: pkgsrc/pkgtools/cwrappers

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Sep 15 17:08:14 UTC 2016

Modified Files:
        pkgsrc/pkgtools/cwrappers: Makefile
        pkgsrc/pkgtools/cwrappers/files/bin: normalise-cc.c

Log Message:
cwrappers-20160908: Allow cc -o -.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/cwrappers/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c

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

Modified files:

Index: pkgsrc/pkgtools/cwrappers/Makefile
diff -u pkgsrc/pkgtools/cwrappers/Makefile:1.15 pkgsrc/pkgtools/cwrappers/Makefile:1.16
--- pkgsrc/pkgtools/cwrappers/Makefile:1.15     Mon Mar 14 20:16:08 2016
+++ pkgsrc/pkgtools/cwrappers/Makefile  Thu Sep 15 17:08:14 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2016/03/14 20:16:08 markd Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/15 17:08:14 joerg Exp $
 
-PKGNAME=               cwrappers-20160110
-PKGREVISION=           1
+PKGNAME=               cwrappers-20160908
 CATEGORIES=            pkgtools sysutils
 
 MAINTAINER=            joerg%NetBSD.org@localhost

Index: pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c
diff -u pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c:1.3 pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c:1.4
--- pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c:1.3      Tue Jul  7 15:00:25 2015
+++ pkgsrc/pkgtools/cwrappers/files/bin/normalise-cc.c  Thu Sep 15 17:08:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: normalise-cc.c,v 1.3 2015/07/07 15:00:25 jperkin Exp $ */
+/* $NetBSD: normalise-cc.c,v 1.4 2016/09/15 17:08:14 joerg Exp $ */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -104,8 +104,16 @@ normalise_cc(struct arglist *args)
        }
 
        TAILQ_FOREACH_SAFE(arg, args, link, arg2) {
-               if (strcmp(arg->val, "-o") == 0 ||
-                   strcmp(arg->val, "-dylib_file") == 0 ||
+               if (strcmp(arg->val, "-o") == 0) {
+                       /* Output to stdout ("-") is explicitly valid. */
+                       if (arg2 == NULL ||
+                           (arg2->val[0] == '-' && arg2->val[1] != '\0'))
+                               errx(255, "Missing argument for %s", arg->val);
+                       arg2 = TAILQ_NEXT(arg2, link);
+                       continue;
+               }
+
+               if (strcmp(arg->val, "-dylib_file") == 0 ||
                    strcmp(arg->val, "-dylib_install_name") == 0 ||
                    strcmp(arg->val, "-install_name") == 0 ||
                    strcmp(arg->val, "-seg_addr_table_filename") == 0 ||