diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/libpcre | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/libpcre')
| -rw-r--r-- | recipes/libpcre/libpcre_7.6.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/recipes/libpcre/libpcre_7.6.bb b/recipes/libpcre/libpcre_7.6.bb index aa038c6e95..f89f83d631 100644 --- a/recipes/libpcre/libpcre_7.6.bb +++ b/recipes/libpcre/libpcre_7.6.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r4" +PR = "r6" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -39,11 +39,10 @@ do_compile () { } do_stage () { - autotools_stage_all - install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ + autotools_stage_all + install -d ${STAGING_BINDIR} + install -m 0755 ${D}${bindir}/pcre-config ${STAGING_BINDIR}/ } - python populate_packages_prepend () { pcre_libdir = bb.data.expand('${libdir}', d) pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d) |