From 314fca573afd230e913779ad2794412eab146c2461c5cee13b6f7b7b18f02b30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 14 Feb 2016 19:10:38 +0000 Subject: [PATCH] Accepting request 359384 from home:olh:branches:devel:libraries:c_c++ - Fix build/test in SLE_11 by using gcc48 OBS-URL: https://build.opensuse.org/request/show/359384 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/jemalloc?expand=0&rev=30 --- jemalloc.changes | 5 +++++ jemalloc.spec | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/jemalloc.changes b/jemalloc.changes index d614261..c8277d0 100644 --- a/jemalloc.changes +++ b/jemalloc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 14 18:27:08 UTC 2016 - olaf@aepfle.de + +- Fix build/test in SLE_11 by using gcc48 + ------------------------------------------------------------------- Sat Oct 24 18:07:12 UTC 2015 - idonmez@suse.com diff --git a/jemalloc.spec b/jemalloc.spec index 065d398..b53721f 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -1,7 +1,7 @@ # # spec file for package jemalloc # -# Copyright (c) 2015 SUSE LINUX 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 @@ -29,6 +29,9 @@ Url: http://canonware.com/jemalloc/ Source: http://www.canonware.com/download/jemalloc/jemalloc-%{version}.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt +%if 0%{?suse_version} == 1110 +BuildRequires: gcc48 +%endif BuildRequires: pkgconfig Requires: %lname = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +71,17 @@ malloc(3) implementation. %build export EXTRA_CFLAGS="%{optflags} -std=gnu99" +%if 0%{?suse_version} == 1110 +if [ -f /usr/bin/gcc-4.6 ]; then + export CC=gcc-4.6 +fi +if [ -f /usr/bin/gcc-4.7 ]; then + export CC=gcc-4.7 +fi +if [ -f /usr/bin/gcc-4.8 ]; then + export CC=gcc-4.8 +fi +%endif %configure --enable-cc-silence \ --enable-prof make %{?_smp_mflags}