Commit 8bb17cd4 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

liboil: remove deprecated

parent 3ac00334
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ source "package/libev/Config.in"
source "package/libffi/Config.in"
source "package/libglib2/Config.in"
source "package/libnspr/Config.in"
source "package/liboil/Config.in"
source "package/libsigc/Config.in"
source "package/orc/Config.in"
source "package/poco/Config.in"

package/liboil/Config.in

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line
config BR2_PACKAGE_LIBOIL
	bool "liboil"
	depends on BR2_DEPRECATED
	help
	  Library of simple functions that are optimized for various CPUs.

	  http://liboil.freedesktop.org/
+0 −16
Original line number Diff line number Diff line
diff --git a/configure.ac b/configure.ac
index 06a0ac9..b8d1640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
     true)
 fi
 
-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
+AC_ARG_ENABLE(vfp,
+  AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
+  enable_vfp=$enableval,enable_vfp=yes)
+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
   AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"],
     true)
+0 −39
Original line number Diff line number Diff line
Patch generated from:
http://cgit.freedesktop.org/liboil/commit/?id=227782d45d14ca0d68ee73b54eab71c1582dcbfa

From 227782d45d14ca0d68ee73b54eab71c1582dcbfa Mon Sep 17 00:00:00 2001
From: Adrian Bunk <adrian.bunk@movial.com>
Date: Wed, 09 Sep 2009 13:31:40 +0000
Subject: fix ARM -mfloat-abi=soft builds

If __SOFTFP__ is defined, VFP support is not available
even when __VFP_FP__ is defined.
---
diff --git a/liboil/arm/math_vfp.c b/liboil/arm/math_vfp.c
index ffd3981..0bed96e 100644
--- a/liboil/arm/math_vfp.c
+++ b/liboil/arm/math_vfp.c
@@ -30,7 +30,7 @@
 #include <liboil/liboilclasses.h>
 #include <liboil/liboilfunction.h>
 
-#if __VFP_FP__
+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
 
 extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
 extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n);
diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S
index ea68dba..ae5c803 100644
--- a/liboil/arm/math_vfp_asm.S
+++ b/liboil/arm/math_vfp_asm.S
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#if __VFP_FP__
+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
 /* 
 ** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
 **
--
cgit v0.8.3-6-g21f6
+0 −34
Original line number Diff line number Diff line
[patch] liboil: don't build examples

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: liboil-0.3.15/Makefile.am
===================================================================
--- liboil-0.3.15.orig/Makefile.am
+++ liboil-0.3.15/Makefile.am
@@ -1,7 +1,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = liboil testsuite examples doc
+SUBDIRS = liboil testsuite doc
 
 EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
 
Index: liboil-0.3.15/Makefile.in
===================================================================
--- liboil-0.3.15.orig/Makefile.in
+++ liboil-0.3.15/Makefile.in
@@ -259,7 +259,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = liboil testsuite examples doc
+SUBDIRS = liboil testsuite doc
 EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
Loading