aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-11-12 10:10:37 +0000
committerGraeme Gregory <dp@xora.org.uk>2009-11-12 10:10:37 +0000
commitdf9f3b227447230ebeb505fb205a3d9be6577b66 (patch)
tree6e91db3e34aaf1d05da97a10f8214cf63e8ba962
parent061212df0c1da218a36b20198419d8fe4fb31755 (diff)
parenta926b9f20c44daba56b6f7301e1b3e7b67311145 (diff)
downloadopenembedded-df9f3b227447230ebeb505fb205a3d9be6577b66.tar.gz
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
-rw-r--r--conf/checksums.ini4
-rw-r--r--recipes/libdiscid/libdiscid.inc5
-rw-r--r--recipes/perl/libwww-mechanize-perl-native_1.60.bb6
-rw-r--r--recipes/perl/libwww-mechanize-perl_1.60.bb10
4 files changed, 20 insertions, 5 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 60d4a718b8..d5393a0a1f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1282,6 +1282,10 @@ sha256=f97b3c0a36c7422d38af67dd68855e5c25581f7b6e79f8671e298e66b4d0026e
md5=9716488c2d1cf2e5f97b165be4de18db
sha256=3d92318dadef22b1d1b062925ef66bac2ad48a0fd4fc83b88dcabba38c182b7b
+[http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/WWW-Mechanize-1.60.tar.gz]
+md5=bd3bf56f28881c5363d1c599ff43a632
+sha256=8844dbc7f695fbc9f87e04895295fc61260559df7176b3159cd3dc2c70863478
+
[http://www.stud.uni-karlsruhe.de/~uvaue/chaos/bins/Wolf4SDL-1.6-src.zip]
md5=61eed8ed819688663e399b5e79ed006f
sha256=6a19418a074a7dec6fd67f00df74f3335e85eb38d2d2a17bd0e91cf8010537e3
diff --git a/recipes/libdiscid/libdiscid.inc b/recipes/libdiscid/libdiscid.inc
index 9f5f1ce9b5..a8ebfafe8a 100644
--- a/recipes/libdiscid/libdiscid.inc
+++ b/recipes/libdiscid/libdiscid.inc
@@ -8,11 +8,6 @@ SRC_URI = "http://users.musicbrainz.org/~matt/libdiscid-${PV}.tar.gz"
inherit cmake pkgconfig
-# Fight a compiler/link bug that leaks too many c++ symbols
-TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib "
-
-S = "${WORKDIR}/${PN}"
-
do_stage() {
autotools_stage_all
}
diff --git a/recipes/perl/libwww-mechanize-perl-native_1.60.bb b/recipes/perl/libwww-mechanize-perl-native_1.60.bb
new file mode 100644
index 0000000000..8718cd268e
--- /dev/null
+++ b/recipes/perl/libwww-mechanize-perl-native_1.60.bb
@@ -0,0 +1,6 @@
+SECTION = "libs"
+
+require libwww-mechanize-perl_${PV}.bb
+
+inherit native
+
diff --git a/recipes/perl/libwww-mechanize-perl_1.60.bb b/recipes/perl/libwww-mechanize-perl_1.60.bb
new file mode 100644
index 0000000000..e82cc498c1
--- /dev/null
+++ b/recipes/perl/libwww-mechanize-perl_1.60.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "WWW::Mechanize Handy web browsing in a Perl object"
+SECTION = "libs"
+LICENSE = "Perl"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/WWW-Mechanize-${PV}.tar.gz"
+
+S = "${WORKDIR}/WWW-Mechanize-${PV}"
+
+inherit cpan