1 |
keri 08/08/22 07:51:10 |
2 |
|
3 |
Modified: mercury-extras-0.13.1-odbc.patch |
4 |
Added: mercury-extras-0.13.1-iodbc.patch |
5 |
Log: |
6 |
Support hlc.gc libgrade |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: mercury-extras-0.13.1-odbc.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- mercury-extras-0.13.1-odbc.patch 4 Dec 2006 09:07:13 -0000 1.1 |
23 |
+++ mercury-extras-0.13.1-odbc.patch 22 Aug 2008 07:51:10 -0000 1.2 |
24 |
@@ -1,6 +1,20 @@ |
25 |
--- mercury-extras-0.13.1.orig/odbc/Mmakefile 2006-04-04 13:49:14.000000000 +1200 |
26 |
-+++ mercury-extras-0.13.1/odbc/Mmakefile 2006-12-04 22:05:56.000000000 +1300 |
27 |
-@@ -48,10 +48,13 @@ |
28 |
++++ mercury-extras-0.13.1/odbc/Mmakefile 2008-08-22 19:27:49.000000000 +1200 |
29 |
+@@ -36,22 +36,25 @@ |
30 |
+ MLLIBS=-lodbc32 |
31 |
+ else |
32 |
+ #ODBC_LIB_DIR=$(IODBC_DIR)/lib |
33 |
+- #ODBC_INCL_DIR=$(IODBC_DIR)/include |
34 |
++ ODBC_CFLAGS=`odbc_config --cflags` |
35 |
+ |
36 |
+ # The following are for Debian. |
37 |
+ |
38 |
+ # for unixODBC |
39 |
+- MLLIBS=-lodbc -lpthread -lltdl -ldl |
40 |
++ MLLIBS=`odbc_config --libs` |
41 |
+ |
42 |
+ # for iODBC |
43 |
+ # MLLIBS=-liodbc l-pthread -ldl |
44 |
# note: on a DEC Alpha using OSF1 remove the -ldl. |
45 |
endif |
46 |
|
47 |
@@ -16,3 +30,12 @@ |
48 |
|
49 |
.PHONY: check |
50 |
check: |
51 |
+@@ -62,7 +65,7 @@ |
52 |
+ # `--no-ansi' is needed because the ODBC header files include C++-style |
53 |
+ # "//" comments. `--no-ansi' allows recognition of C++-style "//" comments, |
54 |
+ # presuming you have gcc version 2.7.1 or greater. |
55 |
+-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR) |
56 |
++MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS) |
57 |
+ |
58 |
+ #-----------------------------------------------------------------------------# |
59 |
+ #-----------------------------------------------------------------------------# |
60 |
|
61 |
|
62 |
|
63 |
1.1 dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch |
64 |
|
65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch?rev=1.1&view=markup |
66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch?rev=1.1&content-type=text/plain |
67 |
|
68 |
Index: mercury-extras-0.13.1-iodbc.patch |
69 |
=================================================================== |
70 |
--- mercury-extras-0.13.1.orig/odbc/Mmakefile 2006-04-04 13:49:14.000000000 +1200 |
71 |
+++ mercury-extras-0.13.1/odbc/Mmakefile 2008-08-22 19:26:52.000000000 +1200 |
72 |
@@ -12,7 +12,7 @@ |
73 |
# The driver manager. |
74 |
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS. |
75 |
# Feel free to add more (and handle them in odbc.m). |
76 |
-MODBC_DRIVER=MODBC_UNIX |
77 |
+MODBC_DRIVER=MODBC_IODBC |
78 |
|
79 |
# The database. |
80 |
# Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER. |
81 |
@@ -36,22 +36,25 @@ |
82 |
MLLIBS=-lodbc32 |
83 |
else |
84 |
#ODBC_LIB_DIR=$(IODBC_DIR)/lib |
85 |
- #ODBC_INCL_DIR=$(IODBC_DIR)/include |
86 |
+ ODBC_CFLAGS=`iodbc-config --cflags` |
87 |
|
88 |
# The following are for Debian. |
89 |
|
90 |
# for unixODBC |
91 |
- MLLIBS=-lodbc -lpthread -lltdl -ldl |
92 |
+ MLLIBS=`iodbc-config --libs` |
93 |
|
94 |
# for iODBC |
95 |
# MLLIBS=-liodbc l-pthread -ldl |
96 |
# note: on a DEC Alpha using OSF1 remove the -ldl. |
97 |
endif |
98 |
|
99 |
-MAIN_TARGET=odbc_test |
100 |
+MAIN_TARGET=libodbc |
101 |
|
102 |
.PHONY: depend |
103 |
-depend: odbc_test.depend |
104 |
+depend: odbc.depend |
105 |
+ |
106 |
+.PHONY: install |
107 |
+install: libodbc.install |
108 |
|
109 |
.PHONY: check |
110 |
check: |
111 |
@@ -62,7 +65,7 @@ |
112 |
# `--no-ansi' is needed because the ODBC header files include C++-style |
113 |
# "//" comments. `--no-ansi' allows recognition of C++-style "//" comments, |
114 |
# presuming you have gcc version 2.7.1 or greater. |
115 |
-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR) |
116 |
+MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS) |
117 |
|
118 |
#-----------------------------------------------------------------------------# |
119 |
#-----------------------------------------------------------------------------# |