Date: Sat, 28 Sep 2013 16:45:28 GMT From: John Levine <hostmaster@iecc.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182464: cvm doesn't build mysql module Message-ID: <201309281645.r8SGjSls012522@oldred.freebsd.org> Resent-Message-ID: <201309281650.r8SGo02f034697@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182464
>Category: ports
>Synopsis: cvm doesn't build mysql module
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 28 16:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Levine
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD joyce.lan 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:34:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
CVM has some optional modules that the Makefile doesn't build. I added an option for the cvm-mysql modules.
I expect a similar option would work for cvm-pgsql but I don't run postgres
>How-To-Repeat:
install cvm, observe no cvm-mysql modules installed in /usr/local/bin
>Fix:
See patch
Patch attached with submission follows:
diff -C2 ./Makefile NEW/Makefile
*** ./Makefile 2013-09-20 18:55:24.000000000 -0400
--- NEW/Makefile 2013-09-28 12:40:38.000000000 -0400
***************
*** 23,28 ****
DOCS= NEWS README TODO *.html
! OPTIONS_DEFINE= VCHKPW
VCHKPW_DESC= Compile cvm-vchkpw
NO_STAGE= yes
--- 23,29 ----
DOCS= NEWS README TODO *.html
! OPTIONS_DEFINE= VCHKPW MYSQL
VCHKPW_DESC= Compile cvm-vchkpw
+ MYSQL_DESC= Compile cvm-mysql
NO_STAGE= yes
***************
*** 39,42 ****
--- 40,53 ----
.endif
+ .if ${PORT_OPTIONS:MMYSQL}
+ BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql55-client
+ ALL_TARGET+= mysql
+ CFLAGS+= -I${LOCALBASE}/include
+ LDFLAGS+= -L${LOCALBASE}/lib/mysql
+ PLIST_SUB+= MYSQL=""
+ .else
+ PLIST_SUB+= MYSQL="@comment "
+ .endif
+
post-patch:
@${REINPLACE_CMD} -e 's|libtool|${LIBTOOL}|g' ${WRKSRC}/Makefile
diff -C2 ./pkg-plist NEW/pkg-plist
*** ./pkg-plist 2012-07-14 10:29:18.000000000 -0400
--- NEW/pkg-plist 2013-09-28 12:40:38.000000000 -0400
***************
*** 2,5 ****
--- 2,8 ----
bin/cvm-chain
bin/cvm-checkpassword
+ %%MYSQL%%bin/cvm-mysql
+ %%MYSQL%%bin/cvm-mysql-local
+ %%MYSQL%%bin/cvm-mysql-udp
bin/cvm-pwfile
bin/cvm-qmail
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309281645.r8SGjSls012522>