From 9851d4466360b337c066eae24047a5eb3d4a7578cec6b55b68104b105fe99fe4 Mon Sep 17 00:00:00 2001 From: Karl Eichwalder Date: Mon, 15 Feb 2016 15:03:09 +0000 Subject: [PATCH] Accepting request 359492 from home:rguenther:branches:Publishing - Build with -fno-lifetime-dse because of object lifetime violations within style/Collector.h OBS-URL: https://build.opensuse.org/request/show/359492 OBS-URL: https://build.opensuse.org/package/show/Publishing/openjade?expand=0&rev=10 --- openjade.changes | 6 ++++++ openjade.spec | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/openjade.changes b/openjade.changes index 9d7ca2a..e1d5ff4 100644 --- a/openjade.changes +++ b/openjade.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 15 12:58:47 UTC 2016 - rguenther@suse.com + +- Build with -fno-lifetime-dse because of object lifetime violations + within style/Collector.h + ------------------------------------------------------------------- Mon Jun 11 13:39:17 CEST 2012 - mls@suse.de diff --git a/openjade.spec b/openjade.spec index c4c43a7..29c4648 100644 --- a/openjade.spec +++ b/openjade.spec @@ -1,7 +1,7 @@ # # spec file for package openjade # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: openjade BuildRequires: gcc-c++ BuildRequires: libtool @@ -34,7 +35,8 @@ Patch4: gcc46_default_ctors.patch Patch5: openjade-1.3.2-getopts.patch # Conflicts: jade_dsl Obsoletes: jade_dsl -Provides: jade jade_dsl +Provides: jade +Provides: jade_dsl Requires: opensp BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://openjade.sourceforge.net/ @@ -69,6 +71,7 @@ Authors: %package devel Summary: DSSSL Engine (development package) +Group: Productivity/Publishing/SGML Requires: %{name} = %{version} %description devel @@ -111,7 +114,11 @@ cp %{S:2} README.SuSE %build # export CXXFLAGS='-O' +%if %{suse_version} > 1320 +export CXXFLAGS="$RPM_OPT_FLAGS -fno-lifetime-dse" +%else export CXXFLAGS="$RPM_OPT_FLAGS" +%endif # export CXXFLAGS="-g -march=i486 -mcpu=i686" # export DEFAULT_SCHEME_BUILTINS=/usr/share/sgml/openjade/builtins.dsl # % {?suse_update_config:% {suse_update_config config}}