Skip to content

Commit

Permalink
3.4.4 ldms github release update
Browse files Browse the repository at this point in the history
added O1 for gcc 4.8.5 bug on toss
  • Loading branch information
baallan committed Sep 1, 2017
1 parent c1bdf03 commit 4be2d32
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cle6.unstable/firerpms
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ packing=cle6.unstable
ovis_branch=master
sos_branch=master
NetworkRequires=gitlab.opengridcomputing.com
[email protected]:tom/SOS.git
#[email protected]:tom/SOS.git
[email protected]:ovis/ovis.git

. ../support/package-functions
Expand Down
2 changes: 1 addition & 1 deletion toss3/firerpms
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
#
packing=toss3
ovis_branch=OVIS-3.4.3
ovis_branch=OVIS-3.4.4
sos_branch=master
NetworkRequires=github.com
#[email protected]:tom/SOS.git
Expand Down
9 changes: 6 additions & 3 deletions toss3/ovis.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Summary: OVIS Commands and Libraries
Name: ovis
Version: @VERSION@
Release: 1.1%{?dist}
Release: 2.1%{?dist}
License: GPLv2 or BSD
Group: %{ldms_all}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Expand Down Expand Up @@ -60,7 +60,7 @@ Prefix: /etc

%description
This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3.
Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags}"
Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags} -O1"


%prep
Expand All @@ -70,7 +70,7 @@ Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags}"
echo bTMPPATH %{_tmppath}
rm -rf $RPM_BUILD_ROOT
echo bBUILDROOT $RPM_BUILD_ROOT
export CFLAGS="@CFLAGS@ %{optflags}"
export CFLAGS="@CFLAGS@ %{optflags} -O1"
%configure @ac_configure_args@
make V=1 -j 16

Expand Down Expand Up @@ -470,6 +470,9 @@ done
@ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery

%changelog
* Thu Aug 31 2017 Ben Allan <[email protected]> 3.4.4-2.1
Update for upstream and override -O2 which produces infinite loop bugs
with toss gcc 4.8.5.
* Wed Apr 26 2017 Ben Allan <[email protected]> 3.4.1-1
Flex array and swig bug patches. Refactor cython dependent bits.
* Wed Mar 29 2017 Ben Allan <[email protected]> 3.4.0-1
Expand Down
4 changes: 2 additions & 2 deletions toss3/patches/flex_array.3.4.1
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ index a5b6314..f0a5168 100755
+# These are the cflags defined by Redhat for daemons and other
+# security-required applications in /usr/lib/rpm/redhat/macros.
+# SUSE and Debian define nearly identical sets. They require c99
+# flexible array syntax in declarations.
+export RHEL7_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches"
+# flexible array syntax in declarations. O1 overrides gcc loop bug.
+export RHEL7_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -O1"
+export CFLAGS="$RHEL7_CFLAGS"
+# See also: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html for why this is important.

Expand Down

0 comments on commit 4be2d32

Please sign in to comment.