From 3f8a14bc8b63968e904c7b53d83cbd5f09c2ad8b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 1 Mar 2008 16:25:41 +0000 Subject: [PATCH] libgcrypt (all except 1.9) refactor into libgcrypt.inc, inherit pkgconfig, remove 1.2.0, 1.2.1, 1.2.2 --- .../{libgcrypt_1.2.1.bb => libgcrypt.inc} | 23 +++++---------- packages/libgcrypt/libgcrypt_1.2.0.bb | 29 ------------------- packages/libgcrypt/libgcrypt_1.2.2.bb | 28 ------------------ packages/libgcrypt/libgcrypt_1.2.3.bb | 23 ++------------- packages/libgcrypt/libgcrypt_1.4.0.bb | 23 ++------------- 5 files changed, 12 insertions(+), 114 deletions(-) rename packages/libgcrypt/{libgcrypt_1.2.1.bb => libgcrypt.inc} (56%) delete mode 100644 packages/libgcrypt/libgcrypt_1.2.0.bb delete mode 100644 packages/libgcrypt/libgcrypt_1.2.2.bb diff --git a/packages/libgcrypt/libgcrypt_1.2.1.bb b/packages/libgcrypt/libgcrypt.inc similarity index 56% rename from packages/libgcrypt/libgcrypt_1.2.1.bb rename to packages/libgcrypt/libgcrypt.inc index 3f4942cae5..2dc2459c09 100644 --- a/packages/libgcrypt/libgcrypt_1.2.1.bb +++ b/packages/libgcrypt/libgcrypt.inc @@ -4,25 +4,18 @@ PRIORITY = "optional" LICENSE = "GPL LGPL FDL" DEPENDS = "libgpg-error" -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" -inherit autotools binconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" -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 +ARM_INSTRUCTION_SET = "arm" +do_stage() { + autotools_stage_all } + +# move libgcrypt-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" diff --git a/packages/libgcrypt/libgcrypt_1.2.0.bb b/packages/libgcrypt/libgcrypt_1.2.0.bb deleted file mode 100644 index be0ad787da..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -PR = "r2" -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -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 - -} diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb deleted file mode 100644 index 3f4942cae5..0000000000 --- a/packages/libgcrypt/libgcrypt_1.2.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" -DEPENDS = "libgpg-error" - -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -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 - -} diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb index 74205da673..2fe98d62e3 100644 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ b/packages/libgcrypt/libgcrypt_1.2.3.bb @@ -1,22 +1,3 @@ -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" +require libgcrypt.inc -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -ARM_INSTRUCTION_SET = "arm" - -do_stage() { - autotools_stage_all -} +PR = "r2" diff --git a/packages/libgcrypt/libgcrypt_1.4.0.bb b/packages/libgcrypt/libgcrypt_1.4.0.bb index 74205da673..2fe98d62e3 100644 --- a/packages/libgcrypt/libgcrypt_1.4.0.bb +++ b/packages/libgcrypt/libgcrypt_1.4.0.bb @@ -1,22 +1,3 @@ -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" +require libgcrypt.inc -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" - -inherit autotools binconfig - -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" - -ARM_INSTRUCTION_SET = "arm" - -do_stage() { - autotools_stage_all -} +PR = "r2" -- 2.39.5