Accepting request 720193 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/720193
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcaca?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger 2019-08-07 11:56:32 +00:00 committed by Git OBS Bridge
commit b69990cdb9
3 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: Bug1143286 libcaca configure ac chg for lto
Date: Thu, 01 Aug 2019 11:43:35 +0200
Bug1143286 libcaca configure ac chg for lto
bypass to avoid PowerPC/ARM build failures
now that LTO is default build option for openSUSE.
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: libcaca-da28e9684ef445ac8d42745644336b8a75c01855/configure.ac
===================================================================
--- libcaca-da28e9684ef445ac8d42745644336b8a75c01855.orig/configure.ac
+++ libcaca-da28e9684ef445ac8d42745644336b8a75c01855/configure.ac
@@ -145,13 +145,13 @@ AC_TRY_COMPILE([#include <windows.h>],[S
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for fsin/fcos)
-AC_TRY_COMPILE([],[double x; asm volatile("fsin; fcos":"=t"(x):);],
+AC_TRY_LINK([],[double x; asm volatile("fsin; fcos":"=t"(x):);],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FSIN_FCOS, 1, [Define to 1 if you have the fsin and fcos instructions.])],
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for fldln2/fxch/fyl2x)
-AC_TRY_COMPILE([],[double x; asm volatile("fldln2; fldln2; fxch; fyl2x":"=t"(x):);],
+AC_TRY_LINK([],[double x; asm volatile("fldln2; fldln2; fxch; fyl2x":"=t"(x):);],
[AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the fldln2 and other floating point instructions.])],
[AC_MSG_RESULT(no)])

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 1 09:46:57 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
- Add Bug1143286_libcaca_configure_ac_chg_for_lto.patch
bypass boo#1143286
-------------------------------------------------------------------
Mon Jan 21 13:01:52 UTC 2019 - josef.moellers@suse.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -37,6 +37,7 @@ Patch9: caca-no-build-date.patch
Patch10: libcaca-ncurses6.patch
Patch11: libcaca-variable-type.patch
Patch12: Bug1120502-add_cast_to_prevent_overflow.patch
Patch13: Bug1143286_libcaca_configure_ac_chg_for_lto.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: freeglut-devel
@ -140,6 +141,7 @@ drawing, triangle filling and sprite blitting.
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
RUBY="ruby-`echo %{rb_ver} | sed 's|\.[^\.]*$||'`"
find . -type f -exec sed -i "s|ruby-1.9|$RUBY|" \{\} \;
pushd python