Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 07/16] grep-2.6.3: Add recipe.
Date: Wed,  2 Jun 2010 13:34:47 -0700	[thread overview]
Message-ID: <1275510896-30845-8-git-send-email-raj.khem@gmail.com> (raw)
In-Reply-To: <1275510896-30845-1-git-send-email-raj.khem@gmail.com>

* Fix build for uclibc as well.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/grep/grep-2.6.3/uclibc-fix.patch |   50 ++++++++++++++++++++++++++++++
 recipes/grep/grep_2.6.3.bb               |   47 ++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 0 deletions(-)
 create mode 100644 recipes/grep/grep-2.6.3/uclibc-fix.patch
 create mode 100644 recipes/grep/grep_2.6.3.bb

diff --git a/recipes/grep/grep-2.6.3/uclibc-fix.patch b/recipes/grep/grep-2.6.3/uclibc-fix.patch
new file mode 100644
index 0000000..2e1c584
--- /dev/null
+++ b/recipes/grep/grep-2.6.3/uclibc-fix.patch
@@ -0,0 +1,50 @@
+Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
+doesn't define __mempcpy only mempcpy. Since both uclibc and glibc have
+mempcpy we'll just use that instead.
+
+Index: grep-2.6.3/lib/getopt.c
+===================================================================
+--- grep-2.6.3.orig/lib/getopt.c	2010-03-21 00:34:02.000000000 -0700
++++ grep-2.6.3/lib/getopt.c	2010-05-22 21:37:11.352740539 -0700
+@@ -41,6 +41,10 @@
+ # include <wchar.h>
+ #endif
+ 
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+    but it behaves differently for the user, since it allows the user
+    to intersperse the options with the other arguments.
+Index: grep-2.6.3/gnulib-tests/setenv.c
+===================================================================
+--- grep-2.6.3.orig/gnulib-tests/setenv.c	2010-05-22 21:37:53.655168151 -0700
++++ grep-2.6.3/gnulib-tests/setenv.c	2010-05-22 21:38:42.792745476 -0700
+@@ -68,6 +68,10 @@ __libc_lock_define_initialized (static, 
+ # define tsearch __tsearch
+ #endif
+ 
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ /* In the GNU C library implementation we try to be more clever and
+    allow arbitrarily many changes of the environment given that the used
+    values are from a small set.  Outside glibc this will eat up all
+Index: grep-2.6.3/lib/regexec.c
+===================================================================
+--- grep-2.6.3.orig/lib/regexec.c	2010-05-22 21:36:02.655154671 -0700
++++ grep-2.6.3/lib/regexec.c	2010-05-22 21:37:26.212743273 -0700
+@@ -22,6 +22,11 @@
+ 
+ #include "verify.h"
+ #include "intprops.h"
++
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
++
+ static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
+ 				     Idx n) internal_function;
+ static void match_ctx_clean (re_match_context_t *mctx) internal_function;
diff --git a/recipes/grep/grep_2.6.3.bb b/recipes/grep/grep_2.6.3.bb
new file mode 100644
index 0000000..c887ca0
--- /dev/null
+++ b/recipes/grep/grep_2.6.3.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+SECTION = "console/utils"
+DESCRIPTION = "grep GNU utility"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
+           file://uclibc-fix.patch"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
+EXTRA_OECONF_virtclass-native = "--with-included-regex --disable-ncurses"
+
+do_configure () {
+	rm -f ${S}/m4/init.m4
+	autotools_do_configure
+}
+
+do_install () {
+	autotools_do_install
+	install -d ${D}${base_bindir}
+	mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
+	mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
+	mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+}
+
+do_install_virtclass-native () {
+	autotools_do_install
+}
+
+pkg_postinst_${PN} () {
+	update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
+	update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
+	update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove grep grep.${PN}
+	update-alternatives --remove egrep egrep.${PN}
+	update-alternatives --remove fgrep fgrep.${PN}
+}
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "69a3bf508a3f14d12369e0e1c7a92763"
+SRC_URI[sha256sum] = "ba745e2ff297ab225bf870740d35593d402a1d92999cf0d7e56840f10218db7c"
+
-- 
1.7.0.4




  parent reply	other threads:[~2010-06-02 20:39 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-02 20:34 [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Khem Raj
2010-06-02 20:34 ` [PATCH 01/16] classes/autotools.bbclass: Dont bail out if gettext/config.rpath does not exist Khem Raj
2010-06-04  7:35   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 02/16] classes/gettext.bbclass: Account for libiconv and libintl too Khem Raj
2010-06-04  7:36   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 03/16] gettext-0.18: Add recipe for 0.18 Khem Raj
2010-06-04  7:37   ` Martin Jansa
2010-06-04  9:41     ` Martin Jansa
2010-06-04  9:49       ` Koen Kooi
2010-06-02 20:34 ` [PATCH 04/16] coreutils-8.5: Add recipes for version 8.5 Khem Raj
2010-06-04  7:37   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 05/16] libiconv-1.13.1: Add recipes Khem Raj
2010-06-04  7:38   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 06/16] db_5.0.21: Add recipes for target and native packages Khem Raj
2010-06-02 20:41   ` Koen Kooi
2010-06-04  0:29     ` Khem Raj
2010-06-04  7:38       ` Martin Jansa
2010-06-08 19:53         ` Jan Paesmans
2010-06-08 21:14           ` Khem Raj
2010-06-02 20:34 ` Khem Raj [this message]
2010-06-04  7:39   ` [PATCH 07/16] grep-2.6.3: Add recipe Martin Jansa
2010-06-07  7:35     ` Jan Paesmans
2010-06-07 14:11       ` Khem Raj
2010-06-07 14:19         ` Jan Paesmans
2010-06-07 14:22           ` Jan Paesmans
2010-06-07 17:14             ` Bernhard Reutner-Fischer
2010-06-02 20:34 ` [PATCH 08/16] glib-2.0_2.24.0.bb: Remove virtual/libiconv virtual/libintl from DEPENDS Khem Raj
2010-06-04  7:39   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 09/16] gnutls_2.8.6.bb: Add recipe for version 2.8.6 Khem Raj
2010-06-04  7:40   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 10/16] inetutils_1.8.bb: Add recipe Khem Raj
2010-06-04  7:40   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 11/16] findutils_4.5.9.bb: " Khem Raj
2010-06-04  7:41   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 12/16] gstreamer_0.10.28.bb: Fix to build with gettext 0.18 Khem Raj
2010-06-04  7:41   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 13/16] ncurses: Add -fforward-propagate on arm Khem Raj
2010-06-04  7:41   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 14/16] zlib.inc: " Khem Raj
2010-06-04  7:42   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 15/16] libx11_1.3.2.bb: " Khem Raj
2010-06-04  7:42   ` Martin Jansa
2010-06-02 20:34 ` [PATCH 16/16] shadow_4.1.4.2.bb: add --with-nscd=no when compiling for uclibc Khem Raj
2010-06-04  7:45 ` [PATCH 00/16] Upgrade gettext, GNU utilities, fix general build issues with uclibc distros Martin Jansa
2010-06-05 18:15 ` Koen Kooi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1275510896-30845-8-git-send-email-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox