diff options
| author | abs <abs@pkgsrc.org> | 2011-05-06 16:21:16 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-05-06 16:21:16 +0000 |
| commit | f48db337a92c5125ca745c41f93c4429dc607813 (patch) | |
| tree | a17fb237f06ac63ec7bd0c0acc5a5e7f077ac2c0 /databases | |
| parent | 34fd7e7c693db07bf483a94bde53155471f9b09f (diff) | |
| download | pkgsrc-f48db337a92c5125ca745c41f93c4429dc607813.tar.gz | |
Fix build on (at least RHEL 5.6). Tested (and no change) on NetBSD 5.99.51
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql55-client/Makefile.common | 3 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/mysql55-server/PLIST | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common index efac6e72e90..2bf32ac5155 100644 --- a/databases/mysql55-client/Makefile.common +++ b/databases/mysql55-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2011/04/27 08:48:59 adam Exp $ +# $NetBSD: Makefile.common,v 1.3 2011/05/06 16:21:25 abs Exp $ # # used by databases/mysql55-client/Makefile # used by databases/mysql55-server/Makefile @@ -66,6 +66,7 @@ CMAKE_ARGS+= -DWITH_LIBEDIT=OFF CMAKE_ARGS+= -DWITH_READLINE=OFF CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} +BROKEN_READLINE_DETECTION= yes # At least on RHEL 5.6 # MySQL 5 depends on builtin functions enabled with i486 and later with GCC. .if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index a51acb1045a..76d4dfa1700 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/04/25 21:12:13 adam Exp $ +# $NetBSD: Makefile,v 1.2 2011/05/06 16:21:16 abs Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -28,7 +28,11 @@ PLIST.embedded= yes #PLIST.ndb= yes #.endif -PLIST_VARS+= embedded ndb +PLIST_VARS+= embedded ndb auth_socket + +.if ${OPSYS} == "Linux" +PLIST.auth_socket= yes +.endif PTHREAD_OPTS+= require diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST index 80707225ce6..a65c1868242 100644 --- a/databases/mysql55-server/PLIST +++ b/databases/mysql55-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/25 21:12:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/05/06 16:21:16 abs Exp $ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -18,6 +18,7 @@ info/mysql.info lib/libmysqlservices.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so +${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so |