Mercurial > mxe-octave
annotate src/postgresql-1-fixes.patch @ 3663:16615236ec37
Remove build-gawk as a dependacy in native mingw
* Makefile.am: in native ming remove build-gawk build, and add awk as a requirement
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 12 Jul 2014 07:55:32 -0400 |
parents | 35404cf378db |
children | e5d08daf58a0 |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2259
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
6 From a92f8ef8826f38edfe010752badc5c280f5b9605 Mon Sep 17 00:00:00 2001 |
2567 | 7 From: "a@a.org" <a@a.org> |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
8 Date: Mon, 24 Oct 2011 14:02:33 +0200 |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
9 Subject: [PATCH 1/4] use unix style names for openssl on mingw-cross-env |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
10 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
11 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
12 diff --git a/configure.in b/configure.in |
3393
166294cad9f0
Update postqresql to 9.2.4 from mxe_devel repo
John Donoghue <john.donoghue@ieee.org>
parents:
2789
diff
changeset
|
13 index 2f8bb3d..441b42b 100644 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
14 --- a/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
15 +++ b/configure.in |
2722 | 16 @@ -926,13 +926,8 @@ fi |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
17 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 if test "$with_openssl" = yes ; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 dnl Order matters! |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 - if test "$PORTNAME" != "win32"; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 - AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 - AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 - else |
2259 | 24 - AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) |
25 - AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) | |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 - fi |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 + AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
28 + AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
29 fi |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
30 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
31 if test "$with_pam" = yes ; then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 -- |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
33 1.9.1 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
36 From 6bbf26ce1f6c0bbd6fc53db1152b1132795b2850 Mon Sep 17 00:00:00 2001 |
2567 | 37 From: "a@a.org" <a@a.org> |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 Date: Mon, 24 Oct 2011 14:09:38 +0200 |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
39 Subject: [PATCH 2/4] do not check autoconf version |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
40 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
42 diff --git a/configure.in b/configure.in |
3393
166294cad9f0
Update postqresql to 9.2.4 from mxe_devel repo
John Donoghue <john.donoghue@ieee.org>
parents:
2789
diff
changeset
|
43 index 441b42b..1257071 100644 |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
44 --- a/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
45 +++ b/configure.in |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 |
3393
166294cad9f0
Update postqresql to 9.2.4 from mxe_devel repo
John Donoghue <john.donoghue@ieee.org>
parents:
2789
diff
changeset
|
48 AC_INIT([PostgreSQL], [9.2.4], [pgsql-bugs@postgresql.org]) |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
51 -Untested combinations of 'autoconf' and PostgreSQL versions are not |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
52 -recommended. You can remove the check from 'configure.in' but it is then |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
53 -your responsibility whether the result works or not.])]) |
2722 | 54 AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group]) |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
56 AC_CONFIG_AUX_DIR(config) |
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
57 -- |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
58 1.9.1 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
59 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
60 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
61 From e7cdd570742aa958d5b45c6971253d9a0ac8ecf4 Mon Sep 17 00:00:00 2001 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
62 From: Timothy Gu <timothygu99@gmail.com> |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
63 Date: Tue, 1 Jul 2014 14:27:21 -0700 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
64 Subject: [PATCH 3/4] Fix shared lib install location |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
65 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
66 Signed-off-by: Timothy Gu <timothygu99@gmail.com> |
2047
5828a4a777a2
package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
67 |
3648
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
68 diff --git a/src/Makefile.shlib b/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
69 index 294d10f..3acdd81 100644 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
70 --- a/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
71 +++ b/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
72 @@ -293,6 +293,7 @@ endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
73 ifeq ($(PORTNAME), win32) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
74 ifdef SO_MAJOR_VERSION |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
75 shlib = lib$(NAME)$(DLSUFFIX) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
76 + stlib = lib$(NAME)$(DLSUFFIX).a |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
77 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
78 haslibarule = yes |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
79 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
80 @@ -447,14 +448,16 @@ ifeq ($(PORTNAME), darwin) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
81 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
82 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
83 ifeq ($(enable_shared), yes) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
84 -install-lib-shared: $(shlib) installdirs-lib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
85 +install-lib-shared: $(shlib) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
86 +ifeq (, $(filter $(PORTNAME), win32 cygwin)) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
87 +install-lib-shared: installdirs-lib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
88 +endif # not win32 or cygwin |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
89 ifdef soname |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
90 # we don't install $(shlib) on AIX |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
91 # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE@EXADV1.host.magwien.gv.at) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
92 ifneq ($(PORTNAME), aix) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
93 +ifeq (, $(filter $(PORTNAME), win32 cygwin)) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
94 $(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/$(shlib)' |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
95 -ifneq ($(PORTNAME), cygwin) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
96 -ifneq ($(PORTNAME), win32) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
97 ifneq ($(shlib), $(shlib_major)) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
98 cd '$(DESTDIR)$(libdir)' && \ |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
99 rm -f $(shlib_major) && \ |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
100 @@ -465,8 +468,9 @@ ifneq ($(shlib), $(shlib_bare)) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
101 rm -f $(shlib_bare) && \ |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
102 $(LN_S) $(shlib) $(shlib_bare) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
103 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
104 -endif # not win32 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
105 -endif # not cygwin |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
106 +else # win32 or cygwin |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
107 + $(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)' |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
108 +endif # not win32 or cygwin |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
109 endif # not aix |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
110 else # no soname |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
111 $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
112 -- |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
113 1.9.1 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
114 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
115 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
116 From 49f1ebdd0a4523f77b889b7dfbd5d34c2e11dab1 Mon Sep 17 00:00:00 2001 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
117 From: Timothy Gu <timothygu99@gmail.com> |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
118 Date: Tue, 1 Jul 2014 14:41:44 -0700 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
119 Subject: [PATCH 4/4] Don't build shared lib on win32 if --disable-shared is |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
120 set |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
121 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
122 Signed-off-by: Timothy Gu <timothygu99@gmail.com> |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
123 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
124 diff --git a/src/Makefile.shlib b/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
125 index 3acdd81..68084cd 100644 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
126 --- a/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
127 +++ b/src/Makefile.shlib |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
128 @@ -291,11 +291,15 @@ ifeq ($(PORTNAME), cygwin) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
129 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
130 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
131 ifeq ($(PORTNAME), win32) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
132 - ifdef SO_MAJOR_VERSION |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
133 - shlib = lib$(NAME)$(DLSUFFIX) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
134 - stlib = lib$(NAME)$(DLSUFFIX).a |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
135 + ifeq ($(enable_shared), yes) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
136 + ifdef SO_MAJOR_VERSION |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
137 + shlib = lib$(NAME)$(DLSUFFIX) |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
138 + stlib = lib$(NAME)$(DLSUFFIX).a |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
139 + endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
140 + haslibarule = yes |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
141 + else |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
142 + shlib = |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
143 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
144 - haslibarule = yes |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
145 endif |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
146 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
147 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
148 -- |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
149 1.9.1 |
35404cf378db
postgres: update to install libpq.dll correctly
John Donoghue <john.donoghue@ieee.org>
parents:
3393
diff
changeset
|
150 |