1 |
grknight 14/09/01 01:15:28 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: myodbc-5.2.7-r1.ebuild |
5 |
Log: |
6 |
Revision bump to enable multilib |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.38 dev-db/myodbc/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.38&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.38&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?r1=1.37&r2=1.38 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v |
20 |
retrieving revision 1.37 |
21 |
retrieving revision 1.38 |
22 |
diff -u -r1.37 -r1.38 |
23 |
--- ChangeLog 20 Aug 2014 18:52:50 -0000 1.37 |
24 |
+++ ChangeLog 1 Sep 2014 01:15:27 -0000 1.38 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for dev-db/myodbc |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.37 2014/08/20 18:52:50 grknight Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.38 2014/09/01 01:15:27 grknight Exp $ |
30 |
+ |
31 |
+*myodbc-5.2.7-r1 (01 Sep 2014) |
32 |
+ |
33 |
+ 01 Sep 2014; Brian Evans <grknight@g.o> |
34 |
+ +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild: |
35 |
+ Revision bump to enable multilib |
36 |
|
37 |
20 Aug 2014; <grknight@g.o> +files/5.2.7-cxxlinkage.patch, |
38 |
+files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-db/myodbc/myodbc-5.2.7-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: myodbc-5.2.7-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild,v 1.1 2014/09/01 01:15:27 grknight Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
inherit cmake-multilib eutils flag-o-matic versionator |
55 |
|
56 |
MAJOR="$(get_version_component_range 1-2 $PV)" |
57 |
MY_PN="mysql-connector-odbc" |
58 |
MY_P="${MY_PN}-${PV/_p/r}-src" |
59 |
|
60 |
DESCRIPTION="ODBC driver for MySQL" |
61 |
HOMEPAGE="http://www.mysql.com/products/myodbc/" |
62 |
SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" |
63 |
RESTRICT="primaryuri" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="${MAJOR}" |
67 |
KEYWORDS="~amd64 ~ppc ~x86" |
68 |
IUSE="" |
69 |
|
70 |
RDEPEND=" |
71 |
dev-db/unixODBC[${MULTILIB_USEDEP}] |
72 |
>=virtual/mysql-5.5[${MULTILIB_USEDEP}] |
73 |
abi_x86_32? ( |
74 |
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)] |
75 |
) |
76 |
" |
77 |
DEPEND="${RDEPEND}" |
78 |
S=${WORKDIR}/${MY_P} |
79 |
|
80 |
# Careful! |
81 |
DRIVER_NAME="${PN}-${SLOT}" |
82 |
|
83 |
src_prepare() { |
84 |
# Remove Tests |
85 |
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ |
86 |
"${S}/CMakeLists.txt" |
87 |
|
88 |
# Fix as-needed on the installer binary |
89 |
echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" |
90 |
|
91 |
# Patch document path so it doesn't install files to /usr |
92 |
epatch "${FILESDIR}/cmake-doc-path.patch" \ |
93 |
"${FILESDIR}/${PVR}-cxxlinkage.patch" \ |
94 |
"${FILESDIR}/${PV}-mariadb-dynamic-array.patch" |
95 |
} |
96 |
|
97 |
multilib_src_configure() { |
98 |
# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" |
99 |
# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB |
100 |
mycmakeargs+=( |
101 |
-DMYSQL_CXX_LINKAGE=0 |
102 |
-DWITH_UNIXODBC=1 |
103 |
-DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" |
104 |
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} |
105 |
-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" |
106 |
-DLIB_SUBDIR="$(get_libdir)" |
107 |
) |
108 |
cmake-utils_src_configure |
109 |
} |
110 |
|
111 |
multilib_src_install_all() { |
112 |
debug-print-function ${FUNCNAME} "$@" |
113 |
|
114 |
dodir /usr/share/${PN}-${SLOT} |
115 |
for i in odbc.ini odbcinst.ini; do |
116 |
einfo "Building $i" |
117 |
sed \ |
118 |
-e "s,__PN__,${DRIVER_NAME},g" \ |
119 |
-e "s,__PF__,${MAJOR},g" \ |
120 |
-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ |
121 |
>"${D}"/usr/share/${PN}-${SLOT}/${i} \ |
122 |
<"${FILESDIR}"/${i}.m4 \ |
123 |
|| die "Failed to build $i" |
124 |
done; |
125 |
mv "${D}/usr/bin/myodbc-installer" \ |
126 |
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" |
127 |
} |
128 |
|
129 |
pkg_config() { |
130 |
|
131 |
[ "${ROOT}" != "/" ] && \ |
132 |
die 'Sorry, non-standard ROOT setting is not supported :-(' |
133 |
|
134 |
local msg='MySQL ODBC driver' |
135 |
local drivers=$(/usr/bin/odbcinst -q -d) |
136 |
|
137 |
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then |
138 |
ebegin "Installing ${msg}" |
139 |
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini |
140 |
rc=$? |
141 |
eend $rc |
142 |
[ $rc -ne 0 ] && die |
143 |
else |
144 |
einfo "Skipping already installed ${msg}" |
145 |
fi |
146 |
|
147 |
local sources=$(/usr/bin/odbcinst -q -s) |
148 |
msg='sample MySQL ODBC DSN' |
149 |
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then |
150 |
ebegin "Installing ${msg}" |
151 |
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini |
152 |
rc=$? |
153 |
eend $rc |
154 |
[ $rc -ne 0 ] && die |
155 |
else |
156 |
einfo "Skipping already installed ${msg}" |
157 |
fi |
158 |
} |
159 |
|
160 |
pkg_postinst() { |
161 |
|
162 |
elog "If this is a new install, please run the following command" |
163 |
elog "to configure the MySQL ODBC drivers and sources:" |
164 |
elog "emerge --config =${CATEGORY}/${PF}" |
165 |
elog "Please note that the driver name used to form the DSN now includes the SLOT." |
166 |
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" |
167 |
} |