/external/liblangtag/

'distro/collabora/cd-5.3-3.2'>distro/collabora/cd-5.3-3.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/postgresql
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-02-03 11:56:48 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2012-02-03 11:58:19 +0100
commitd8b5d223877ea743f35424582284c15444e78a15 (patch)
treeb6d79b0c90871dfd026a41e32f124fe103853227 /postgresql
parenta71c878cd0b443a0d8473d8e4eb43d66f37ce2c0 (diff)
redo c16027de8423cdb6b33ce5f5f9e13fdc25b9dbeb cleaner
Also align our configure.in to the changes Change source file (configure.in), not only generated file (configure)
Diffstat (limited to 'postgresql')
-rw-r--r--postgresql/makefile.mk9
-rw-r--r--postgresql/postgresql-9.1.1-autoreconf.patch326
-rw-r--r--postgresql/postgresql-9.1.1-configure.patch362
-rw-r--r--postgresql/postgresql-libs-leak.patch39
4 files changed, 365 insertions, 371 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 44b7e6f6d0ba..2d814bdeb798 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -40,14 +40,9 @@ TARFILE_NAME=postgresql-9.1.1
TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
PATCH_FILES=\
postgresql-moz-ldap.patch \
+ postgresql-libs-leak.patch \
$(TARFILE_NAME)-libreoffice.patch \
- $(TARFILE_NAME)-autoreconf.patch \
- postgresql-9.1.1-configure.patch
-# postgresql-9.1.1-configure.patch: move check for with_krb5 before with_gssapi,
-# so that LIBS does not already contain -lgssapi_krb5 (which links against
-# -lkrb5) when looking for symbols from -lkrb5, and within with_krb5, move
-# com_err before krb5, so that looking with symbol com_err does not erroneously
-# pick -lkrb5 (which links against -lcom_err) instead of -lcom_err
+ $(TARFILE_NAME)-autoreconf.patch
.IF "$(SYSTEM_POSTGRESQL)" == "YES"
@all:
diff --git a/postgresql/postgresql-9.1.1-autoreconf.patch b/postgresql/postgresql-9.1.1-autoreconf.patch
index 24e294a534e5..ce91c51ff53f 100644
--- a/postgresql/postgresql-9.1.1-autoreconf.patch
+++ b/postgresql/postgresql-9.1.1-autoreconf.patch
@@ -1,6 +1,6 @@
diff --recursive -u misc/build/postgresql-9.1.1/configure misc/build/postgresql-9.1.1.patched/configure
--- misc/build/postgresql-9.1.1/configure 2011-09-22 23:57:57.000000000 +0200
-+++ misc/build/postgresql-9.1.1.patched/configure 2011-12-15 09:30:36.000000000 +0100
++++ misc/build/postgresql-9.1.1.patched/configure 2012-02-03 11:50:07.000000000 +0100
@@ -718,6 +718,7 @@
with_selinux
with_openssl
@@ -68,6 +68,328 @@ diff --recursive -u misc/build/postgresql-9.1.1/configure misc/build/postgresql-
#
# Bonjour
+@@ -8533,11 +8572,11 @@
+ *** Not using spinlocks will cause poor performance." >&2;}
+ fi
+
+-if test "$with_gssapi" = yes ; then
++if test "$with_krb5" = yes ; then
+ if test "$PORTNAME" != "win32"; then
+- { $as_echo "$as_me:$LINENO: checking for library containing gss_init_sec_context" >&5
+-$as_echo_n "checking for library containing gss_init_sec_context... " >&6; }
+-if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
++ { $as_echo "$as_me:$LINENO: checking for library containing com_err" >&5
++$as_echo_n "checking for library containing com_err... " >&6; }
++if test "${ac_cv_search_com_err+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -8554,16 +8593,16 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char gss_init_sec_context ();
++char com_err ();
+ int
+ main ()
+ {
+-return gss_init_sec_context ();
++return com_err ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'; do
++for ac_lib in '' com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+@@ -8591,7 +8630,7 @@
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+- ac_cv_search_gss_init_sec_context=$ac_res
++ ac_cv_search_com_err=$ac_res
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8602,40 +8641,33 @@
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+- if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
++ if test "${ac_cv_search_com_err+set}" = set; then
+ break
+ fi
+ done
+-if test "${ac_cv_search_gss_init_sec_context+set}" = set; then
++if test "${ac_cv_search_com_err+set}" = set; then
+ :
+ else
+- ac_cv_search_gss_init_sec_context=no
++ ac_cv_search_com_err=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gss_init_sec_context" >&5
+-$as_echo "$ac_cv_search_gss_init_sec_context" >&6; }
+-ac_res=$ac_cv_search_gss_init_sec_context
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
++$as_echo "$ac_cv_search_com_err" >