Mercurial > mxe-octave

comparison src/postgresql-1-fixes.patch @ 3648:35404cf378db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
postgres: update to install libpq.dll correctly * src/postgresql.mk: update to remove has libarule in make * src/postgresql-1-fixes.patch: update patch from mxe-devel
author John Donoghue <john.donoghue@ieee.org>
date Tue, 08 Jul 2014 20:21:15 -0400
parents 166294cad9f0
children e5d08daf58a0
comparison
equal deleted inserted replaced
3647:fc67e3ab9324 3648:35404cf378db
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From 35d61378829a8cd151084184ebd55de1b074b324 Mon Sep 17 00:00:00 2001 6 From a92f8ef8826f38edfe010752badc5c280f5b9605 Mon Sep 17 00:00:00 2001
7 From: "a@a.org" <a@a.org> 7 From: "a@a.org" <a@a.org>
8 Date: Mon, 24 Oct 2011 14:02:33 +0200 8 Date: Mon, 24 Oct 2011 14:02:33 +0200
9 Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env 9 Subject: [PATCH 1/4] use unix style names for openssl on mingw-cross-env
10 10
11 11
12 diff --git a/configure.in b/configure.in 12 diff --git a/configure.in b/configure.in
13 index 2f8bb3d..441b42b 100644 13 index 2f8bb3d..441b42b 100644
14 --- a/configure.in 14 --- a/configure.in
28 + AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) 28 + AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
29 fi 29 fi
30 30
31 if test "$with_pam" = yes ; then 31 if test "$with_pam" = yes ; then
32 -- 32 --
33 1.8.1.4 33 1.9.1
34 34
35 35
36 From 48f27fc5b79373e696cd8db2a5195d9efc084c13 Mon Sep 17 00:00:00 2001 36 From 6bbf26ce1f6c0bbd6fc53db1152b1132795b2850 Mon Sep 17 00:00:00 2001
37 From: "a@a.org" <a@a.org> 37 From: "a@a.org" <a@a.org>
38 Date: Mon, 24 Oct 2011 14:09:38 +0200 38 Date: Mon, 24 Oct 2011 14:09:38 +0200
39 Subject: [PATCH 2/2] do not check autoconf version 39 Subject: [PATCH 2/4] do not check autoconf version
40 40
41 41
42 diff --git a/configure.in b/configure.in 42 diff --git a/configure.in b/configure.in
43 index 441b42b..1257071 100644 43 index 441b42b..1257071 100644
44 --- a/configure.in 44 --- a/configure.in
53 -your responsibility whether the result works or not.])]) 53 -your responsibility whether the result works or not.])])
54 AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group]) 54 AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
55 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) 55 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
56 AC_CONFIG_AUX_DIR(config) 56 AC_CONFIG_AUX_DIR(config)
57 -- 57 --
58 1.8.1.4 58 1.9.1
59 59
60
61 From e7cdd570742aa958d5b45c6971253d9a0ac8ecf4 Mon Sep 17 00:00:00 2001
62 From: Timothy Gu <timothygu99@gmail.com>
63 Date: Tue, 1 Jul 2014 14:27:21 -0700
64 Subject: [PATCH 3/4] Fix shared lib install location
65
66 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
67
68 diff --git a/src/Makefile.shlib b/src/Makefile.shlib
69 index 294d10f..3acdd81 100644
70 --- a/src/Makefile.shlib
71 +++ b/src/Makefile.shlib
72 @@ -293,6 +293,7 @@ endif
73 ifeq ($(PORTNAME), win32)
74 ifdef SO_MAJOR_VERSION
75 shlib = lib$(NAME)$(DLSUFFIX)
76 + stlib = lib$(NAME)$(DLSUFFIX).a
77 endif
78 haslibarule = yes
79 endif
80 @@ -447,14 +448,16 @@ ifeq ($(PORTNAME), darwin)
81 endif
82
83 ifeq ($(enable_shared), yes)
84 -install-lib-shared: $(shlib) installdirs-lib
85 +install-lib-shared: $(shlib)
86 +ifeq (, $(filter $(PORTNAME), win32 cygwin))
87 +install-lib-shared: installdirs-lib
88 +endif # not win32 or cygwin
89 ifdef soname
90 # we don't install $(shlib) on AIX
91 # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE@EXADV1.host.magwien.gv.at)
92 ifneq ($(PORTNAME), aix)
93 +ifeq (, $(filter $(PORTNAME), win32 cygwin))
94 $(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/$(shlib)'
95 -ifneq ($(PORTNAME), cygwin)
96 -ifneq ($(PORTNAME), win32)
97 ifneq ($(shlib), $(shlib_major))
98 cd '$(DESTDIR)$(libdir)' && \
99 rm -f $(shlib_major) && \
100 @@ -465,8 +468,9 @@ ifneq ($(shlib), $(shlib_bare))
101 rm -f $(shlib_bare) && \
102 $(LN_S) $(shlib) $(shlib_bare)
103 endif
104 -endif # not win32
105 -endif # not cygwin
106 +else # win32 or cygwin
107 + $(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
108 +endif # not win32 or cygwin
109 endif # not aix
110 else # no soname
111 $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
112 --
113 1.9.1
114
115
116 From 49f1ebdd0a4523f77b889b7dfbd5d34c2e11dab1 Mon Sep 17 00:00:00 2001
117 From: Timothy Gu <timothygu99@gmail.com>
118 Date: Tue, 1 Jul 2014 14:41:44 -0700
119 Subject: [PATCH 4/4] Don't build shared lib on win32 if --disable-shared is
120 set
121
122 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
123
124 diff --git a/src/Makefile.shlib b/src/Makefile.shlib
125 index 3acdd81..68084cd 100644
126 --- a/src/Makefile.shlib
127 +++ b/src/Makefile.shlib
128 @@ -291,11 +291,15 @@ ifeq ($(PORTNAME), cygwin)
129 endif
130
131 ifeq ($(PORTNAME), win32)
132 - ifdef SO_MAJOR_VERSION
133 - shlib = lib$(NAME)$(DLSUFFIX)
134 - stlib = lib$(NAME)$(DLSUFFIX).a
135 + ifeq ($(enable_shared), yes)
136 + ifdef SO_MAJOR_VERSION
137 + shlib = lib$(NAME)$(DLSUFFIX)
138 + stlib = lib$(NAME)$(DLSUFFIX).a
139 + endif
140 + haslibarule = yes
141 + else
142 + shlib =
143 endif
144 - haslibarule = yes
145 endif
146
147
148 --
149 1.9.1
150