pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/ORBit2 Sunpro (and possibly other compilers') prep...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b72c35ff895
branches:  trunk
changeset: 482913:6b72c35ff895
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Fri Nov 05 10:19:10 2004 +0000

description:
Sunpro (and possibly other compilers') preprocessor takes the input of
"#pragma<space>foo..." and outputs "#pragma<tab>foo...", breaking the
ORBit preprocessor which only looks for the former.  Ensure the latter
case is handled.

Fixes build on Solaris/Sunpro.

diffstat:

 net/ORBit2/distinfo         |   3 ++-
 net/ORBit2/patches/patch-aa |  21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 2098bd5badaa -r 6b72c35ff895 net/ORBit2/distinfo
--- a/net/ORBit2/distinfo       Fri Nov 05 09:46:22 2004 +0000
+++ b/net/ORBit2/distinfo       Fri Nov 05 10:19:10 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.20 2004/09/21 16:44:14 jmmv Exp $
+$NetBSD: distinfo,v 1.21 2004/11/05 10:19:10 sketch Exp $
 
 SHA1 (ORBit2-2.12.0.tar.bz2) = 76bdfbfb6ac797aa2075b7c6de40df916129fc77
 Size (ORBit2-2.12.0.tar.bz2) = 666898 bytes
+SHA1 (patch-aa) = 6e87e28e3634908f35c219f81a47d0353cfaf551
diff -r 2098bd5badaa -r 6b72c35ff895 net/ORBit2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ORBit2/patches/patch-aa       Fri Nov 05 10:19:10 2004 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.6 2004/11/05 10:19:10 sketch Exp $
+
+--- src/idl-compiler/orbit-idl-c-headers.c.orig        Wed Nov  3 13:10:51 2004
++++ src/idl-compiler/orbit-idl-c-headers.c     Wed Nov  3 13:11:53 2004
+@@ -447,6 +447,16 @@
+       while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
+       *cte = '\0';
+       fprintf(ci->fh, "#include <%s>\n", ctmp);
++    } else if(!strncmp(list->data,
++              "#pragma\tinclude_defs",
++              sizeof("#pragma\tinclude_defs")-1)) {
++      char *ctmp, *cte;
++      ctmp = ((char *)list->data) + sizeof("#pragma\tinclude_defs");
++      while(*ctmp && (isspace((int)*ctmp) || *ctmp == '"')) ctmp++;
++      cte = ctmp;
++      while(*cte && !isspace((int)*cte) && *cte != '"') cte++;
++      *cte = '\0';
++      fprintf(ci->fh, "#include <%s>\n", ctmp);
+     } else
+       fprintf(ci->fh, "%s\n", (char *)list->data);
+   }



Home | Main Index | Thread Index | Old Index