diff options
| author | wiz <wiz@pkgsrc.org> | 2010-03-16 19:24:54 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-03-16 19:24:54 +0000 |
| commit | 4b825c05d1012124bd5b538131d4ce796f23423b (patch) | |
| tree | ffe7fa6aa40797da212a6bc206489ccd11b93a85 /databases | |
| parent | 6c79289865abdb7192c9be8cdd7b1d031864d6a3 (diff) | |
| download | pkgsrc-4b825c05d1012124bd5b538131d4ce796f23423b.tar.gz | |
Enable PIC compilation, needed for working mysql-embedded support
(and perhaps also on Solaris).
Bump PKGREVISION.
Ok taca@
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql51-client/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql51-client/Makefile.common | 5 | ||||
| -rw-r--r-- | databases/mysql51-server/DESCR | 1 | ||||
| -rw-r--r-- | databases/mysql51-server/Makefile | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 9044317c04e..4a8d2ffe452 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ +# $NetBSD: Makefile,v 1.2 2010/03/16 19:24:54 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} +PKGREVISION= 1 SVR4_PKGNAME= mysqc COMMENT= MySQL 5, a free SQL database (client) diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common index 50c57fd6953..9d4bf2b9e67 100644 --- a/databases/mysql51-client/Makefile.common +++ b/databases/mysql51-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ +# $NetBSD: Makefile.common,v 1.2 2010/03/16 19:24:54 wiz Exp $ # # used by databases/mysql51-client/Makefile # used by databases/mysql51-server/Makefile @@ -80,6 +80,9 @@ CONFIGURE_ENV+= mysql_cv_compress="yes" CPPFLAGS+= -Dunix CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat +CFLAGS+= -fPIC -DPIC +CXXFLAGS+= -fPIC -DPIC + # force HAVE_CURSES_H on Solaris since the configure script is broken # and does not properly detect this, breaking the build later on. .if ${OPSYS} == "SunOS" diff --git a/databases/mysql51-server/DESCR b/databases/mysql51-server/DESCR index d1551a0eafa..971baa82c25 100644 --- a/databases/mysql51-server/DESCR +++ b/databases/mysql51-server/DESCR @@ -14,4 +14,3 @@ The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL). This package contains the MySQL server programs and libraries including embedded server (by PKG_OPTION). - diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index d3c1b58c89f..703547099ec 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/04 16:28:57 taca Exp $ +# $NetBSD: Makefile,v 1.2 2010/03/16 19:24:54 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} +PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 5, a free SQL database (server) @@ -21,6 +22,8 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} .if !empty(PKG_OPTIONS:Membedded-server) CONFIGURE_ARGS+= --with-embedded-privilege-control CONFIGURE_ARGS+= --with-embedded-server +#CONFIGURE_ARGS+= --with-mysqld-ldflags=-all-static +CONFIGURE_ARGS+= --with-pic PLIST.embedded= yes .endif |