From 8779efc02075a1a77bf9fed8dbc676ea8be671ee297f80955fbd864dd34dd405 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 30 Jul 2012 07:42:15 +0000 Subject: [PATCH] Accepting request 129097 from home:msmeissn:branches:multimedia:libs - fixed the -lm detection to actually work in --as-needed scenarios OBS-URL: https://build.opensuse.org/request/show/129097 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gavl?expand=0&rev=5 --- gavl-autoconf.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++ gavl.changes | 6 +++++ gavl.spec | 4 +++ 3 files changed, 71 insertions(+) create mode 100644 gavl-autoconf.patch diff --git a/gavl-autoconf.patch b/gavl-autoconf.patch new file mode 100644 index 0000000..611e9a9 --- /dev/null +++ b/gavl-autoconf.patch @@ -0,0 +1,61 @@ +Index: gavl-1.4.0/acinclude.m4 +=================================================================== +--- gavl-1.4.0.orig/acinclude.m4 ++++ gavl-1.4.0/acinclude.m4 +@@ -46,7 +46,9 @@ AC_DEFUN([AC_C99_FUNC_LRINT], + ac_cv_c99_lrint, + [ + lrint_save_CFLAGS=$CFLAGS +-CFLAGS="-O2 -lm" ++lrint_save_LIBS=$LIBS ++CFLAGS="$CFLAGS -O2" ++LIBS="$LIBS -lm" + AC_TRY_LINK([ + #define _ISOC9X_SOURCE 1 + #define _ISOC99_SOURCE 1 +@@ -57,6 +59,7 @@ AC_TRY_LINK([ + ], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no) + + CFLAGS=$lrint_save_CFLAGS ++LIBS=$lrint_save_LIBS + + ]) + +Index: gavl-1.4.0/configure.ac +=================================================================== +--- gavl-1.4.0.orig/configure.ac ++++ gavl-1.4.0/configure.ac +@@ -129,6 +129,7 @@ fi + dnl + dnl Check for library functions + dnl ++AC_CHECK_FUNC(m,sinf) + + AC_CHECK_FUNCS([memalign]) + AC_CHECK_FUNCS([sched_setaffinity]) +Index: gavl-1.4.0/src/Makefile.am +=================================================================== +--- gavl-1.4.0.orig/src/Makefile.am ++++ gavl-1.4.0/src/Makefile.am +@@ -30,7 +30,7 @@ benchmark_LDADD = ../gavl/libgavl.la @RT + + + volume_test_SOURCES = volume_test.c +-volume_test_LDADD = ../gavl/libgavl.la ++volume_test_LDADD = ../gavl/libgavl.la -lm + + dump_frame_table_SOURCES = dump_frame_table.c + dump_frame_table_LDADD = ../gavl/libgavl.la +Index: gavl-1.4.0/src/Makefile.in +=================================================================== +--- gavl-1.4.0.orig/src/Makefile.in ++++ gavl-1.4.0/src/Makefile.in +@@ -282,7 +282,7 @@ pixelformat_penalty_LDADD = ../gavl/libg + benchmark_SOURCES = benchmark.c + benchmark_LDADD = ../gavl/libgavl.la @RT_LIBS@ + volume_test_SOURCES = volume_test.c +-volume_test_LDADD = ../gavl/libgavl.la ++volume_test_LDADD = ../gavl/libgavl.la -lm + dump_frame_table_SOURCES = dump_frame_table.c + dump_frame_table_LDADD = ../gavl/libgavl.la + colorspace_test_SOURCES = colorspace_test.c diff --git a/gavl.changes b/gavl.changes index 697bb90..74972c2 100644 --- a/gavl.changes +++ b/gavl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 27 11:53:44 UTC 2012 - meissner@suse.com + +- fixed the -lm detection to actually work in --as-needed + scenarios + ------------------------------------------------------------------- Fri Jun 15 16:20:54 UTC 2012 - reddwarf@opensuse.org diff --git a/gavl.spec b/gavl.spec index 2bc0f5f..9d97eb9 100644 --- a/gavl.spec +++ b/gavl.spec @@ -26,6 +26,8 @@ License: GPL-3.0+ Group: System/Libraries Url: http://gmerlin.sourceforge.net/ Source0: http://sourceforge.net/projects/gmerlin/files/gavl/%{version}/gavl-%{version}.tar.gz +Patch0: gavl-autoconf.patch +BuildRequires: autoconf BuildRequires: doxygen BuildRequires: pkg-config @@ -72,8 +74,10 @@ blending etc). %prep %setup -q +%patch0 -p1 %build +autoconf %configure --docdir=%{_docdir}/%{name} --without-cpuflags make %{?_smp_mflags}