[oe-commits] org.oe.dev merge of '34d07eb5a0a81538143c57486cc515538a4d97ea'

[koen commit]

merge of '34d07eb5a0a81538143c57486cc515538a4d97ea'
     and 'cccbcdee9adebcb074bf6947b2a127fec3260453'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 528c70fd35c4abbbc5ca2d29a08877e037f09e69
ViewMTN: http://monotone.openembedded.org/revision/info/528c70fd35c4abbbc5ca2d29a08877e037f09e69
Files:
1
packages/atk/atk_1.19.3.bb
packages/libgcrypt/libgcrypt_1.2.3.bb
Diffs:

#
# mt diff -r34d07eb5a0a81538143c57486cc515538a4d97ea -r528c70fd35c4abbbc5ca2d29a08877e037f09e69
#
# 
# 
# patch "packages/atk/atk_1.19.3.bb"
#  from [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
#    to [e94d8f3fd021065300ad78c840ea3acacdb490d8]
# 
============================================================
--- packages/atk/atk_1.19.3.bb	656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb	e94d8f3fd021065300ad78c840ea3acacdb490d8
@@ -1,7 +1,5 @@ require atk.inc
 require atk.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
 
 do_stage () {


#
# mt diff -rcccbcdee9adebcb074bf6947b2a127fec3260453 -r528c70fd35c4abbbc5ca2d29a08877e037f09e69
#
# 
# 
# patch "packages/libgcrypt/libgcrypt_1.2.3.bb"
#  from [e276a08d0c5be389810c76df1d581dbc07ac6eb8]
#    to [b1dae0759fc4781ccd62f97bbf98ed78f9053815]
# 
============================================================
--- packages/libgcrypt/libgcrypt_1.2.3.bb	e276a08d0c5be389810c76df1d581dbc07ac6eb8
+++ packages/libgcrypt/libgcrypt_1.2.3.bb	b1dae0759fc4781ccd62f97bbf98ed78f9053815
@@ -1,8 +1,9 @@ DEPENDS = "libgpg-error"
 DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
+PR = "r1"
 
 # move libgcrypt-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
@@ -17,14 +18,5 @@ do_stage() {
 ARM_INSTRUCTION_SET = "arm"
 
 do_stage() {
-	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
-	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
-
-	install -d ${STAGING_INCDIR}/
-	for X in gcrypt.h gcrypt-module.h
-	do
-		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
-	done
-
+	autotools_stage_all
 }