jskarvad pushed to nacl (master). "Fixed sed optflags patching to work with new distro CFLAGS (..more)"

[notifications at fedoraproject.org]

From 3173df3bc323f1a12e33502b5e84cb1115dacbfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Mon, 11 May 2015 16:12:05 +0200
Subject: Fixed sed optflags patching to work with new distro CFLAGS

- Rebuilt with new distro CFLAGS (PIC)
- Fixed typo in dist-flags patch
- Limit length of ABI string (by abi-len-lmit patch)

diff --git a/nacl-20110221-abi-len-limit.patch b/nacl-20110221-abi-len-limit.patch
new file mode 100644
index 0000000..d2b2b1a
--- /dev/null
+++ b/nacl-20110221-abi-len-limit.patch
@@ -0,0 +1,14 @@
+diff --git a/okcompilers/do b/okcompilers/do
+index 372b7e0..5429488 100755
+--- a/okcompilers/do
++++ b/okcompilers/do
+@@ -88,7 +88,8 @@ do
+   done
+ 
+   abi=`awk '{print length($0),$0}' < c-compatible \
+-  | sort -n | head -1 | sed 's/ *$//' | sed 's/^[^ ]* //' | tr ' /' '__'`
++  | sort -n | head -1 | sed 's/ *$//' | sed 's/^[^ ]* //' | tr ' /' '__' \
++  | head -c 128`
+ 
+   echo "echo '"$abi"'" >&7
+ 
diff --git a/nacl-20110221-dist-flags.patch b/nacl-20110221-dist-flags.patch
index 12fb822..354f5c7 100644
--- a/nacl-20110221-dist-flags.patch
+++ b/nacl-20110221-dist-flags.patch
@@ -29,4 +29,4 @@ diff -up nacl-20110221/okcompilers/cpp.orig nacl-20110221/okcompilers/cpp
 -g++ -m32 -fomit-frame-pointer
 -spu-g++ -mstdmain -march=cell -O3 -funroll-loops -fomit-frame-pointer -Drandom=rand -Dsrandom=srand
 -spu-g++ -mstdmain -march=cell -O -fomit-frame-pointer -Drandom=rand -Dsrandom=srand
-+g++ -${CFLAGS}
++g++ ${CFLAGS}
diff --git a/nacl.spec b/nacl.spec
index b27f733..8e62d69 100644
--- a/nacl.spec
+++ b/nacl.spec
@@ -20,6 +20,7 @@ Patch1:         nacl-20110221-build-dir.patch
 Patch2:         nacl-20110221-noexec-stack.patch
 # Fix for secondary arches
 Patch3:         nacl-20110221-cpufreq-fallback.patch
+Patch4:         nacl-20110221-abi-len-limit.patch
 
 %package devel
 Summary:        Development files
@@ -42,6 +43,7 @@ Include files and devel library.
 %patch1 -p1 -b .build-dir
 %patch2 -p1 -b .noexec-stack
 %patch3 -p1 -b .cpufreq-fallback
+%patch4 -p1 -b .abi-len-limit
 
 sed -i 's|\${CFLAGS}|%{optflags}|g' okcompilers/c okcompilers/cpp
 
@@ -78,6 +80,8 @@ install -m 0755 -t %{buildroot}%{_bindir} build/fedora/bin/*
 * Mon May 11 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 20110221-11
 - Fixed sed optflags patching to work with new distro CFLAGS
 - Rebuilt with new distro CFLAGS (PIC)
+- Fixed typo in dist-flags patch
+- Limit length of ABI string (by abi-len-lmit patch)
 
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110221-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nacl.git/commit/?h=master&id=3173df3bc323f1a12e33502b5e84cb1115dacbfa