From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../remove-hard-coded-include-and-lib-paths.patch | 43 ++++++++++++++++++++++ .../tokyocabinet/tokyocabinet_1.4.48.bb | 27 ++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb (limited to 'meta-openembedded/meta-oe/recipes-support/tokyocabinet') diff --git a/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch new file mode 100644 index 0000000000..a8ab23de71 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch @@ -0,0 +1,43 @@ +Upstream-Status: Inappropriate [embedded specific] + +There are hardcode paths in configure.in eg: /usr/include, $HOME/include etc. +These paths will cause Makefile to search host path when doing cross-compiling. +and bitbake will prompt this as an error. So remove them. + +Signed-off-by: Song.Li +Signed-off-by: Kai Kang +--- + configure.in | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/configure.in b/configure.in +index bcfd5bc..5b24947 100644 +--- a/configure.in ++++ b/configure.in +@@ -32,21 +32,15 @@ MYPCFILES="tokyocabinet.pc" + + # Building flags + MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2" +-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include" ++MYCPPFLAGS="-I." + MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__" +-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib" ++MYLDFLAGS="-L." + MYCMDLDFLAGS="" + MYRUNPATH="\$(LIBDIR)" + MYLDLIBPATHENV="LD_LIBRARY_PATH" + MYPOSTCMD="true" + + # Building paths +-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb" +-CPATH="$HOME/include:/usr/local/include:$CPATH" +-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH" +-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH" +-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" + export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH + + +-- +1.7.9.5 + diff --git a/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb new file mode 100644 index 0000000000..9f75cf047d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb @@ -0,0 +1,27 @@ +# +# Copyright (C) 2012 - 2016 Wind River Systems, Inc. +# +SUMMARY = "A modern implementation of DBM" + +DESCRIPTION = "Tokyo Cabinet is a library of routines for managing a database. \ +The database is a simple data file containing records, each is a pair of a key \ +and a value. Every key and value is serial bytes with variable length. \ +Both binary data and character string can be used as a key and a value. \ +There is neither concept of data tables nor data types. \ +Records are organized in hash table, B+ tree, or fixed-length array." + +HOMEPAGE = "http://fallabs.com/tokyocabinet/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \ + file://remove-hard-coded-include-and-lib-paths.patch \ +" + +SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e" +SRC_URI[sha256sum] = "a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90" + +DEPENDS = "bzip2 zlib" + +inherit autotools-brokensep -- cgit v1.2.3