Skip to contentSkip to conversation

guile-native: Add patch to inhibit generation of linemarkers from cpp.

PATCH In review Robert P. J. Day 2 participants 3 messages Nov 19, 2009 – Nov 20, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 guile-native: Add patch to inhibit generation of linemarkers from cpp.

Add the "-P" option to inhibit generation of linemarkers in the output from the preprocessor.

---

i've tested this and it seems to work. after this gets applied,
i'll submit a patch to add guile 1.8.7 to the mix. did i get the patch format right? two edited files, one new one.

recipes/guile/files/cpp-linemarkers.patch new file +8 -0
new file mode 100644
index 0000000..54f58eb
@@ -0,0 +1,8 @@
+--- guile.orig/libguile/guile-snarf-docs.in	2009-07-03 18:19:00.000000000 -0400
++++ guile/libguile/guile-snarf-docs.in	2009-11-19 12:55:32.487266268 -0500
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
recipes/guile/guile-native_1.8.5.bb +1 -0
index 9c2eb13..5c999db 100644
@@ -4,6 +4,7 @@ DEPENDS = "libtool (< 2)"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 \
+           file://cpp-linemarkers.patch;patch=1 \
           "
 
 PR = "r1"
recipes/guile/guile-native_1.8.6.bb +1 -0
index d511807..2f87c48 100644
@@ -1,4 +1,5 @@
 require guile-native.inc
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch;patch=1 \
+           file://cpp-linemarkers.patch;patch=1 \
           "

rday
--

========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA

Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday

========================================================================

#1 lore raw

I've applied this. It did not break my build on F11. If this causes build errors, revert if necessary. Hopefully, this is not needed.

Thanks,

Philip

Quoted 67 lines · Robert P. J. Day

Add the "-P" option to inhibit generation of linemarkers in the output from the preprocessor.

---

i've tested this and it seems to work. after this gets applied,
i'll submit a patch to add guile 1.8.7 to the mix. did i get the patch format right? two edited files, one new one.

recipes/guile/files/cpp-linemarkers.patch new file +8 -0
new file mode 100644
index 0000000..54f58eb
@@ -0,0 +1,8 @@
+--- guile.orig/libguile/guile-snarf-docs.in	2009-07-03 18:19:00.000000000 -0400
++++ guile/libguile/guile-snarf-docs.in	2009-11-19 12:55:32.487266268 -0500
+@@ -23,4 +23,4 @@
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
recipes/guile/guile-native_1.8.5.bb +1 -0
index 9c2eb13..5c999db 100644
@@ -4,6 +4,7 @@ DEPENDS = "libtool (<  2)"
 
  SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
             file://configure-fix.patch;patch=1 \
+           file://cpp-linemarkers.patch;patch=1 \
            "
 
  PR = "r1"
recipes/guile/guile-native_1.8.6.bb +1 -0
index d511807..2f87c48 100644
@@ -1,4 +1,5 @@
  require guile-native.inc
  SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
             file://configure-fix.patch;patch=1 \
+           file://cpp-linemarkers.patch;patch=1 \
            "

rday
--

========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA

Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday

========================================================================

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 2 lines · Philip Balister

I've applied this. It did not break my build on F11. If this causes build errors, revert if necessary. Hopefully, this is not needed.

i've just pulled and started a fresh bb-demo-image build as a stress
test. fingers crossed. if that works, i'll post a patch upgrading to guile-1.8.7 as well, since i've verified that that will build as well with the same patch.

rday
--

========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA

Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday

========================================================================