From 6b7dc740f29e5f2db5b7b971fb403a8d29cb53a1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 21 Sep 2010 10:58:20 +0200 Subject: [PATCH] libfsobascis_git.bb: Add patch to compile with uClibc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit uClibc does not provide `execinfo.h`, which is a “GNUism” [1]. Applying this patch from Frederik Sdun [1] and passing `--enable-no-gnuism` to configure when compiling with uClibc lets `libfsobasics_git.bb` build with uClibc. I just compile tested this and it solves the `execinfo.h` error. Now it fails with `eventfd.h`. [1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-September/024411.html Signed-off-by: Paul Menzel --- recipes/freesmartphone/libfsobasics/nognuism.patch | 54 ++++++++++++++++++++ recipes/freesmartphone/libfsobasics_git.bb | 6 ++- 2 files changed, 59 insertions(+), 1 deletions(-) create mode 100644 recipes/freesmartphone/libfsobasics/nognuism.patch diff --git a/recipes/freesmartphone/libfsobasics/nognuism.patch b/recipes/freesmartphone/libfsobasics/nognuism.patch new file mode 100644 index 0000000..455b76e --- /dev/null +++ b/recipes/freesmartphone/libfsobasics/nognuism.patch @@ -0,0 +1,54 @@ +diff --git a/libfsobasics/configure.ac b/libfsobasics/configure.ac +index ba06907..d9d4172 100644 +--- a/libfsobasics/configure.ac ++++ b/libfsobasics/configure.ac +@@ -48,6 +48,12 @@ AC_ARG_ENABLE(debug, + [debug="no"]) + AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) + ++AC_ARG_ENABLE(no_gnuism, ++ [ --enable-no-gnuism Enable build for none GNU-libc (default=disabled)], ++ [no_gnuism=$enableval], ++ [no_gnuism="no"]) ++AM_CONDITIONAL( [WANT_NO_GNUISM], [test x"$no_gnuism" = x"yes"]) ++ + # git version + GITV=`cat ../.git/refs/heads/master || echo "unknown"` + AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version]) +diff --git a/libfsobasics/fsobasics/Makefile.am b/libfsobasics/fsobasics/Makefile.am +index 66a7cd7..0fc534a 100644 +--- a/libfsobasics/fsobasics/Makefile.am ++++ b/libfsobasics/fsobasics/Makefile.am +@@ -23,6 +23,10 @@ VALAC_ARGS += -g -D DEBUG + AM_CFLAGS += -ggdb -O0 + endif + ++if WANT_NO_GNUISM ++VALAC_ARGS += -D NO_GNUISM ++endif ++ + BUILT_SOURCES = fsobasics.vala.stamp + + lib_LTLIBRARIES = \ +diff --git a/libfsobasics/fsobasics/utilities.vala b/libfsobasics/fsobasics/utilities.vala +index 22d107d..6ed5fc8 100644 +--- a/libfsobasics/fsobasics/utilities.vala ++++ b/libfsobasics/fsobasics/utilities.vala +@@ -420,6 +420,9 @@ namespace FsoFramework { namespace Utility { + public string[] createBacktrace() + { + string[] result = new string[] { }; ++#if NO_GNUISM ++ result += "Backtrace not support for none GNU libcs"; ++#else + void* buffer = malloc0( BACKTRACE_SIZE * sizeof(string) ); + var size = Linux.backtrace( buffer, BACKTRACE_SIZE ); + string[] symbols = Linux.backtrace_symbols( buffer, size ); +@@ -429,6 +432,7 @@ namespace FsoFramework { namespace Utility { + result += "%s\n".printf( symbols[i] ); + } + result += "--- END BACKTRACE ---\n"; ++#endif + return result; + } + diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 42b2ed7..018e0d2 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -5,4 +5,8 @@ DEPENDS += "libnl2" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.9.10+gitr${SRCPV}" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +SRC_URI += "file://nognuism.patch;striplevel=2" + +EXTRA_OECONF_append_uclinux-uclibc = " --enable-no-gnuism" -- 1.7.1