From b7c3d6989313170fcd071f39f9eca01721ab36c5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 7 May 2011 23:19:51 +0000 Subject: postgresql: update to 8.4.7 since 8.4.4 was unfetchable This has been synced with postgresql recipes in OE. Signed-off-by: Otavio Salvador --- .../postgresql-8.4.4/remove.autoconf.version.check.patch | 15 --------------- .../postgresql-8.4.7/remove.autoconf.version.check.patch | 15 +++++++++++++++ meta-oe/recipes-support/postgresql/postgresql.inc | 6 ++++-- meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb | 11 ----------- meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb | 10 ++++++++++ 5 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch create mode 100644 meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch delete mode 100644 meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb create mode 100644 meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb diff --git a/meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch deleted file mode 100644 index d027061d89..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: postgresql-8.4.4/configure.in -=================================================================== ---- postgresql-8.4.4.orig/configure.in -+++ postgresql-8.4.4/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - - AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required. --Untested combinations of 'autoconf' and PostgreSQL versions are not --recommended. You can remove the check from 'configure.in' but it is then --your responsibility whether the result works or not.])]) - AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) diff --git a/meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch b/meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch new file mode 100644 index 0000000000..514a9aa7b0 --- /dev/null +++ b/meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch @@ -0,0 +1,15 @@ +Index: postgresql-8.4.7/configure.in +=================================================================== +--- postgresql-8.4.7.orig/configure.in ++++ postgresql-8.4.7/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un + + AC_INIT([PostgreSQL], [8.4.7], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index edad3bcc5b..53c38df0de 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc @@ -1,14 +1,14 @@ DESCRIPTION = "PostgreSQL is a powerful, open source relational database system." HOMEPAGE = "http://www.postgresql.com" LICENSE = "BSD" - DEPENDS = "zlib readline tzcode-native" +INC_PR = "r5" ARM_INSTRUCTION_SET = "arm" #WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic -SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2" +SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2" LEAD_SONAME = "libpq.so" @@ -17,6 +17,8 @@ export LDFLAGS_SL = "${LDFLAGS}" inherit autotools pkgconfig +EXTRA_OECONF_sh4 = "--disable-spinlocks" + do_compile_append() { cp /usr/sbin/zic ${S}/src/timezone/ } diff --git a/meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb b/meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb deleted file mode 100644 index d0f5078498..0000000000 --- a/meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=29b81b066680be9ffd98cb9d2afb9de6" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2 \ - file://remove.autoconf.version.check.patch" - -SRC_URI[md5sum] = "4bf2448ad965bca3940df648c02194df" -SRC_URI[sha256sum] = "e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e" diff --git a/meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb b/meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb new file mode 100644 index 0000000000..63f324c928 --- /dev/null +++ b/meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb @@ -0,0 +1,10 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=29b81b066680be9ffd98cb9d2afb9de6" + +PR = "${INC_PR}.0" + +SRC_URI += "file://remove.autoconf.version.check.patch" + +SRC_URI[md5sum] = "689397187bb1dfe9b5cbde99538311c3" +SRC_URI[sha256sum] = "08032849da121e67e318f7ff4e68d3ac88f29050e242641f717c4270839b597b" -- cgit v1.2.3-54-g00ecf