On Ubuntu 13 and its variants cpp puts some empty lines on top of
the output files.
With the outcome that in case of shell scripts the shebang line is
ignored. This breaks many parts in CDE.
This patch avoids the additional lines.
--
Ulrich Wilkens
Email: m...@uwilkens.de
>From c7b1c12a1c76c03f33f3bf6a673e8d2d1472a418 Mon Sep 17 00:00:00 2001
From: Ulrich Wilkens <m...@uwilkens.de>
Date: Wed, 12 Mar 2014 19:43:12 +0100
Subject: [PATCH] Fix cpp output on Ubuntu 13
---
cde/config/cf/Imake.rules | 2 +-
cde/config/cf/linux.cf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cde/config/cf/Imake.rules b/cde/config/cf/Imake.rules
index 6b21cd7..6fa1ecc 100644
--- a/cde/config/cf/Imake.rules
+++ b/cde/config/cf/Imake.rules
@@ -2376,7 +2376,7 @@ MakeMakeSubdirs(dirs,Makefiles)
* Also delete line numbers from the cpp output (-P is not portable, I guess).
*/
#ifndef CppSedMagic
-#define CppSedMagic $(SED) -e '/^# *[0-9][0-9]* *.*$$/d' -e
'/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
+#define CppSedMagic $(SED) -e '/^#[line]* *[0-9][0-9]* *.*$$/d' -e
'/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
#endif /* CppSedMagic */
#ifndef CppFileTarget
diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 4d1c6ab..8124855 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -121,7 +121,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LdCombineFlags -r
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#define HasWChar32 YES
-#define StandardCppDefines -traditional StandardDefines
+#define StandardCppDefines -traditional -nostdinc StandardDefines
#define ExtensionOSDefines -DXTESTEXT1
#define LinuxLocaleDefines /**/
--
1.7.11.5
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
