pool/ksh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 311613 from home:Andreas_Schwab:Factory

Browse Source 
- 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
This commit is contained in:
Dr. Werner Fink 2015-06-29 08:53:56 +00:00 committed by Git OBS Bridge
parent 5cf7cf3748
commit b0a56fb8f6
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpp.patch Normal file
View File

@ -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

5
ksh.changes
View File

@ -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

5
ksh.spec
View File

@ -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