X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql-ossp_uuid.patch;fp=postgresql-ossp_uuid.patch;h=0000000000000000000000000000000000000000;hb=5e86bde66b513fe5ccfc11a9efcfe49cd38a5478;hp=b5b2dfa5477626b92c86e6d606cdc48d7eb655ca;hpb=86b50b0e01c6dda47a82d42c32283add77bb9043;p=packages%2Fpostgresql.git

diff --git a/postgresql-ossp_uuid.patch b/postgresql-ossp_uuid.patch
deleted file mode 100644
index b5b2dfa..0000000
--- a/postgresql-ossp_uuid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- postgresql-9.4.0/configure.in.orig	2015-01-05 23:55:32.000000000 +0100
-+++ postgresql-9.4.0/configure.in	2015-01-06 00:03:58.433386714 +0100
-@@ -1166,13 +1166,13 @@
-         [AC_MSG_ERROR([header file <uuid.h> does not match E2FS UUID library])])],
-       [AC_MSG_ERROR([header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID])])])
- elif test "$with_uuid" = ossp ; then
--  AC_CHECK_HEADERS(ossp/uuid.h,
--    [AC_EGREP_HEADER([uuid_export], ossp/uuid.h, [],
--      [AC_MSG_ERROR([header file <ossp/uuid.h> does not match OSSP UUID library])])],
-+  AC_CHECK_HEADERS(ossp-uuid/uuid.h,
-+    [AC_EGREP_HEADER([uuid_export], ossp-uuid/uuid.h, [],
-+      [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> does not match OSSP UUID library])])],
-     [AC_CHECK_HEADERS(uuid.h,
-       [AC_EGREP_HEADER([uuid_export], uuid.h, [],
-         [AC_MSG_ERROR([header file <uuid.h> does not match OSSP UUID library])])],
--      [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID])])])
-+      [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> or <uuid.h> is required for OSSP UUID])])])
- fi
- 
- if test "$PORTNAME" = "win32" ; then
---- postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c.org	2015-03-23 10:41:24.000000000 +0100
-+++ postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c	2015-03-23 10:54:29.403373571 +0100
-@@ -29,8 +29,8 @@
- #ifdef HAVE_UUID_H
- #include <uuid.h>
- #endif
--#ifdef HAVE_OSSP_UUID_H
--#include <ossp/uuid.h>
-+#ifdef HAVE_OSSP_UUID_UUID_H
-+#include <ossp-uuid/uuid.h>
- #endif
- #ifdef HAVE_UUID_UUID_H
- #include <uuid/uuid.h>
-