From 905dbcb3c787a590e621e9dacc5c0d8f2e733305 Mon Sep 17 00:00:00 2001
From: Dave Love <d.love@liverpool.ac.uk>
Date: Dec 13 2015 13:42:21 +0000
Subject: Avoid compiler ICE on ppc64le (#1280387)


---

diff --git a/dssp-make.patch b/dssp-make.patch
index b6388ce..b1aa1d8 100644
--- a/dssp-make.patch
+++ b/dssp-make.patch
@@ -1,5 +1,5 @@
---- dssp-2.2.1/makefile~	2015-03-30 12:47:25.154334540 +0100
-+++ dssp-2.2.1/makefile	2015-03-30 12:50:35.985040213 +0100
+--- dssp-2.2.1/makefile.make	2013-09-11 07:33:28.000000000 +0100
++++ dssp-2.2.1/makefile	2015-12-13 13:08:01.069936929 +0000
 @@ -19,7 +19,7 @@
  LIB_DIR				= $(BOOST_LIB_DIR)
  INC_DIR				= $(BOOST_INC_DIR)
@@ -9,7 +9,24 @@
  
  BOOST_LIBS			= thread filesystem program_options iostreams system
  LIBS				= $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) z bz2
-@@ -49,28 +49,26 @@
+@@ -29,6 +29,7 @@
+ 
+ CFLAGS				+= $(INC_DIR:%=-I%) -iquote src -g -Wall -Wno-multichar -pthread
+ LDOPTS				+= $(LIB_DIR:%=-L%) $(LIBS:%=-l%) -g -pthread
++COPT				= -O3
+ 
+ OBJ_DIR				= obj
+ 
+@@ -37,7 +38,7 @@
+ CFLAGS				+= -g3
+ else
+ DEFINES				+= NDEBUG
+-CFLAGS				+= -O3
++CFLAGS				+= $(COPT)
+ endif
+ 
+ CFLAGS				+= $(DEFINES:%=-D%)
+@@ -49,28 +50,26 @@
  OBJECTS = $(OBJ_DIR)/mkdssp.o $(OBJ_DIR)/dssp.o $(OBJ_DIR)/primitives-3d.o $(OBJ_DIR)/structure.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/mas.o $(OBJ_DIR)/iocif.o
  
  mkdssp: $(OBJECTS)
@@ -44,4 +61,3 @@
  
  dist:
  	@ rm -rf $(DIST_NAME)
-
diff --git a/dssp.spec b/dssp.spec
index 4f1ee6e..22bdde1 100644
--- a/dssp.spec
+++ b/dssp.spec
@@ -3,7 +3,7 @@
 
 Name:		dssp
 Version:	2.2.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Protein secondary structure assignment
 %{?el5:Group:		Applications/Engineering}
 License:	Boost
@@ -63,6 +63,11 @@ LDOPTS=%__global_ldflags -L%_libdir/boost141" >>make.config
 echo "CFLAGS=$RPM_OPT_FLAGS -I/usr/include
 LDOPTS=%__global_ldflags -L%_libdir" >>make.config
 %endif
+# The original makefile uses -O3, presumably for good reason, but
+# avoid compiler ICE on ppc64le (#1280387).
+%ifarch ppc64le
+COPT=-O2 \
+%endif
 make %{?_smp_mflags}
 
 
@@ -85,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 13 2015 Dave Love <loveshack@fedoraproject.org> - 2.2.1-7
+- Avoid compiler ICE on ppc64le (#1280387)
+
 * Thu Jul 30 2015 Dave Love <d.love@liverpool.ac.uk> - 2.2.1-6
 - Use __global_ldflags and Boost paths unconditionally per review