From b0a56fb8f63b462430439cf258fccc3601e97d21850793aafe903a6047ae4eb2 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 29 Jun 2015 08:53:56 +0000
Subject: [PATCH] Accepting request 311613 from home:Andreas_Schwab:Factory

- cpp.patch: fix use of cc -E without -P

OBS-URL: https://build.opensuse.org/request/show/311613
OBS-URL: https://build.opensuse.org/package/show/shells/ksh?expand=0&rev=213
---
 cpp.patch   | 24 ++++++++++++++++++++++++
 ksh.changes |  5 +++++
 ksh.spec    |  5 ++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 cpp.patch

diff --git a/cpp.patch b/cpp.patch
new file mode 100644
index 0000000..a73b5d4
--- /dev/null
+++ b/cpp.patch
@@ -0,0 +1,24 @@
+iffe depends on cc -E not inserting newlines between tokens
+
+Index: ksh93/src/cmd/INIT/iffe.sh
+===================================================================
+--- ksh93.orig/src/cmd/INIT/iffe.sh
++++ ksh93/src/cmd/INIT/iffe.sh
+@@ -3427,7 +3427,7 @@ $src
+ 						(eval "$src") <&$nullin || e=1
+ 						;;
+ 					mac*|nomac*)
+-						if	compile $cc -E $tmp.c <&$nullin >$tmp.i
++						if	compile $cc -E -P $tmp.c <&$nullin >$tmp.i
+ 						then	sed -e '/<<[ 	]*".*"[ 	]*>>/!d' -e 's/<<[ 	]*"//g' -e 's/"[ 	]*>>//g' $tmp.i
+ 						else	e=1
+ 						fi
+@@ -3718,7 +3718,7 @@ $inc
+ <<\"#define $v\">>	$v	<<\"/* native $v */\">>
+ <<\"#endif\">>
+ #endif" > $tmp.c
+-					if	compile $cc -E $tmp.c <&$nullin >$tmp.i
++					if	compile $cc -E -P $tmp.c <&$nullin >$tmp.i
+ 					then	sed -e '/<<[ 	]*".*"[ 	]*>>/!d' -e 's/<<[ 	]*"//g' -e 's/"[ 	]*>>//g' $tmp.i > $tmp.t
+ 						if	test -s $tmp.t
+ 						then	success
diff --git a/ksh.changes b/ksh.changes
index cdb05f1..ce18949 100644
--- a/ksh.changes
+++ b/ksh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 11 10:42:59 UTC 2015 - schwab@suse.de
+
+- cpp.patch: fix use of cc -E without -P
+
 -------------------------------------------------------------------
 Fri Aug  1 06:58:17 UTC 2014 - werner@suse.de
 
diff --git a/ksh.spec b/ksh.spec
index fdcd234..508f18a 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ksh
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -134,6 +134,8 @@ Patch36:        ksh93-fs3d.dif
 Patch37:        ksh93-crashes.dif
 # PATCH-FIX-SUSE Strings in backticks cannot be longer than 65536 characters bnc#887320
 Patch38:        ksh93-backticks.dif
+# PATCH-FIX-UPSTREAM fix use of cc -E without -P
+Patch39:        cpp.patch
 Patch42:        ksh-locale.patch
 
 %description
@@ -219,6 +221,7 @@ fi
 %patch36
 %patch37
 #%patch38
+%patch39 -p1
 %patch42
 
 %build