diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2010-10-01 01:07:58 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-10-06 15:25:30 -0700 |
| commit | 0f4f8f3e765459bc11ab9573c1d5d9bf0e5d79c3 (patch) | |
| tree | 75143bef9bd7965055f75de2ad70793ca661b224 /recipes/libsigc++-1.2 | |
| parent | 0741f11dcba3aae5d1e26361730ea32e8f078916 (diff) | |
| download | openembedded-0f4f8f3e765459bc11ab9573c1d5d9bf0e5d79c3.tar.gz | |
libsigc++-1.2: fix installation
* install complains about method_slot.h, which is mentioned twice
inside Makefile.am.
* v2: Added header to patch.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/libsigc++-1.2')
| -rw-r--r-- | recipes/libsigc++-1.2/files/fix-install.patch | 15 | ||||
| -rw-r--r-- | recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb | 3 | ||||
| -rw-r--r-- | recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/recipes/libsigc++-1.2/files/fix-install.patch b/recipes/libsigc++-1.2/files/fix-install.patch new file mode 100644 index 0000000000..1cdfedbc07 --- /dev/null +++ b/recipes/libsigc++-1.2/files/fix-install.patch @@ -0,0 +1,15 @@ +upstream: unmaintained + +| ...build/tmp/sysroots/i686-linux/usr/bin/install: will not overwrite just-created `...build/tmp/work/mipsel-oe-linux/libsigc++-1.2-1.2.5-r2/image/usr/include/sigc++-1.2/sigc++/method_slot.h' with `method_slot.h' + +--- libsigc++-1.2.7/sigc++/Makefile.am.orig 2010-09-24 12:03:24.000000000 +0000 ++++ libsigc++-1.2.7/sigc++/Makefile.am 2010-09-24 12:03:30.000000000 +0000 +@@ -12,7 +12,7 @@ + sigc_built_h = bind_return.h \ + object_slot.h retype_return.h slot.h bind.h \ + class_slot.h hide.h retype.h signal.h \ +- method_slot.h method_slot.h ++ method_slot.h + + built_sources = $(sigc_built_cc) $(sigc_built_h) + dist_sources = $(sigc_fixed_cc) $(sigc_fixed_h) diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb index 2c32f14cbf..6b347e5daf 100644 --- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb +++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb @@ -1,10 +1,11 @@ DESCRIPTION = "A library for loose coupling of C++ method calls" SECTION = "libs" PRIORITY = "optional" -PR = "r1" +PR = "r2" LICENSE = "GPL LGPL" SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \ file://autofoo.patch \ + file://fix-install.patch \ file://pkgconfig.patch" S = "${WORKDIR}/libsigc++-${PV}" diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb index c68105b17e..179d5a65f8 100644 --- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb +++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb @@ -2,10 +2,11 @@ DESCRIPTION = "A library for loose coupling of C++ method calls" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL LGPL" -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \ file://autofoo.patch \ + file://fix-install.patch \ file://disable-tests.patch" S = "${WORKDIR}/libsigc++-${PV}" |