Attachment #192985 for bug #225472




--- m4/ax_lib_mysql.m4.orig	2018-04-03 21:15:54.000000000 +1000
+++ m4/ax_lib_mysql.m4	2018-05-02 11:02:38.434851000 +1000
@@ -78,48 +78,53 @@

     if test "$want_mysql" = "yes"; then

-        AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
+        AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])

         if test -x "$MYSQL_CONFIG"; then
             MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
             _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
+            _all_libmysql_libs=""

-             _save_mysql_ldflags="${LDFLAGS}"
-            _save_mysql_cflags="${CFLAGS}"
-            LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
-            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"

             for i in $_full_libmysql_libs; do
                 case $i in
-                    -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb)
-
-                        _lib_name="`echo "$i" | cut -b3-`"
-                        AC_CHECK_LIB($_lib_name, main, [
-                        	MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
-                        	],[
-                        	AC_MSG_ERROR([Not found $_lib_name library])
-                        	])
-                ;;
                     -L*)

                         MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
                 ;;
                     -l*)
-
-                        _lib_name="`echo "$i" | cut -b3-`"
-                        AC_CHECK_LIB($_lib_name, main, [
-                        	MYSQL_LIBS="${MYSQL_LIBS} ${i}"
-                        	],[
-                        	AC_MSG_ERROR([Not found $i library])
-                        	])
+                        _all_libmysql_libs="${_all_libmysql_libs} $i"
                 ;;
                 esac
             done
+            _save_mysql_ldflags="${LDFLAGS}"
+            _save_mysql_cflags="${CFLAGS}"
+            LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
+            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
+            for i in $_all_libmysql_libs; do
+                _client_lib_name="`echo "$i" | cut -b3-`"
+                if test "x$enable_static" != "xyes"; then
+                    AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
+                    MYSQL_LIBS="${i} ${MYSQL_LIBS}"
+                 ])
+                else
+                    AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
+                    MYSQL_LIBS="${_all_libmysql_libs} ${MYSQL_LIBS}"
+                 ])
+                fi
+            done
+
+            if test -z "$MYSQL_LIBS"; then
+                 AC_MSG_ERROR([Could not find MySQL client library])
+            fi

             LDFLAGS="${_save_mysql_ldflags}"
 1 diff -u -Nr zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 zabbix34-server/files/patch-m4-ax__lib__mysql.m4
 2 --- zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4    1970-01-01 10:00:00.000000000 +1000
 3 +++ zabbix34-server/files/patch-m4-ax__lib__mysql.m4    2018-05-02 11:07:10.711107000 +1000
 4 @@ -0,0 +1,77 @@
 5 +--- m4/ax_lib_mysql.m4.orig    2018-04-03 21:15:54.000000000 +1000
 6 ++++ m4/ax_lib_mysql.m4 2018-05-02 11:02:38.434851000 +1000
 7 +@@ -78,48 +78,53 @@
 8 +
 9 +     if test "$want_mysql" = "yes"; then
10 +
11 +-        AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
12 ++        AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])
13 +
14 +         if test -x "$MYSQL_CONFIG"; then
15 +             MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
16 +             _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
17 ++            _all_libmysql_libs=""
18 +
19 +-             _save_mysql_ldflags="${LDFLAGS}"
20 +-            _save_mysql_cflags="${CFLAGS}"
21 +-            LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
22 +-            CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
23 +
24 +             for i in $_full_libmysql_libs; do
25 +                 case $i in
26 +-                    -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb)
27 +-
28 +-                        _lib_name="`echo "$i" | cut -b3-`"
29 +-                        AC_CHECK_LIB($_lib_name, main, [
30 +-                          MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
31 +-                          ],[
32 +-                          AC_MSG_ERROR([Not found $_lib_name library])
33 +-                          ])
34 +-                ;;
35 +                     -L*)
36 +
37 +                         MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
38 +                 ;;
39 +                     -l*)
40 +-
41 +-                        _lib_name="`echo "$i" | cut -b3-`"
42 +-                        AC_CHECK_LIB($_lib_name, main, [
43 +-                          MYSQL_LIBS="${MYSQL_LIBS} ${i}"
44 +-                          ],[
45 +-                          AC_MSG_ERROR([Not found $i library])
             CFLAGS="${_save_mysql_cflags}"
             unset _save_mysql_ldflags
             unset _save_mysql_cflags
+            unset _full_libmysql_libs
+            unset _all_libmysql_libs
+            unset _client_lib_name

             MYSQL_VERSION=`$MYSQL_CONFIG --version`


Lines 34-40 Link Here

(-)zabbix34-server/Makefile (-4 / +6 lines)
34	USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d	34	USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
35	.endif	35	.endif
36	USES= pkgconfig iconv	36	USES= autoreconf iconv pkgconfig
37	USERS= zabbix	37	USERS= zabbix
38	GROUPS= zabbix	38	GROUPS= zabbix
Lines 189-197 Link Here
189	${WRKSRC}/database/${d}/data.sql	189	${WRKSRC}/database/${d}/data.sql
190	. endfor	190	. endfor
191	.endif	191	.endif
192	@${REINPLACE_CMD} \
193	-Ee 's\|(@sysconfdir@/(\$$$[A-Z]_CONFIG$))" ([\|][\|] cp "../../conf/\$$$[A-Z]_CONFIG$" "\$$$DESTDIR$@sysconfdir@)"\|\1.sample" \3/\2.sample"\|;' \
194	${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
195	@${FIND} ${WRKSRC} -type f $ -name '.bak' -or -name '.orig' $ \	192	@${FIND} ${WRKSRC} -type f $ -name '.bak' -or -name '.orig' $ \
196	-exec ${RM} {} +	193	-exec ${RM} {} +
Lines 209-214 Link Here
209	(cd ${WRKSRC}/database/ && \	206	(cd ${WRKSRC}/database/ && \
210	${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \	207	${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \
211	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)	208	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
		209	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \
		210	${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample
		211	.else
		212	${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \
		213	${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample
212	.endif	214	.endif
213	.else # frontend	215	.else # frontend
214	.include <bsd.port.pre.mk>	216	.include <bsd.port.pre.mk>

Return to bug 225472

Line 0 Link Here

(-)zabbix34-server/files/patch-m4-ax__lib__mysql.m4 (+77 lines)
		1	--- m4/ax_lib_mysql.m4.orig 2018-04-03 21:15:54.000000000 +1000
		2	+++ m4/ax_lib_mysql.m4 2018-05-02 11:02:38.434851000 +1000
		3	@@ -78,48 +78,53 @@
		4
		5	if test "$want_mysql" = "yes"; then
		6
		7	- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
		8	+ AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])
		9
		10	if test -x "$MYSQL_CONFIG"; then
		11	MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
		12	_full_libmysql_libs="`$MYSQL_CONFIG --libs`"
		13	+ _all_libmysql_libs=""
		14
		15	- _save_mysql_ldflags="${LDFLAGS}"
		16	- _save_mysql_cflags="${CFLAGS}"
		17	- LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
		18	- CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
		19
		20	for i in $_full_libmysql_libs; do
		21	case $i in
		22	- -lmysqlclient\|-lperconaserverclient\|-lmariadbclient\|-lmariadb)
		23	-
		24	- _lib_name="`echo "$i" \| cut -b3-`"
		25	- AC_CHECK_LIB($_lib_name, main, [
		26	- MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
		27	- ],[
		28	- AC_MSG_ERROR([Not found $_lib_name library])
		29	- ])
		30	- ;;
		31	-L*)
		32
		33	MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
		34	;;
		35	-l*)
		36	-
		37	- _lib_name="`echo "$i" \| cut -b3-`"
		38	- AC_CHECK_LIB($_lib_name, main, [
		39	- MYSQL_LIBS="${MYSQL_LIBS} ${i}"
		40	- ],[
		41	- AC_MSG_ERROR([Not found $i library])
		42	- ])
		43	+ _all_libmysql_libs="${_all_libmysql_libs} $i"
		44	;;
		45	esac
		46	done
		47	+ _save_mysql_ldflags="${LDFLAGS}"
		48	+ _save_mysql_cflags="${CFLAGS}"
		49	+ LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
		50	+ CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
		51	+ for i in $_all_libmysql_libs; do
		52	+ _client_lib_name="`echo "$i" \| cut -b3-`"
		53	+ if test "x$enable_static" != "xyes"; then
		54	+ AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
		55	+ MYSQL_LIBS="${i} ${MYSQL_LIBS}"
		56	+ ])
		57	+ else
		58	+ AC_CHECK_LIB([$_client_lib_name], [mysql_error], [
		59	+ MYSQL_LIBS="${_all_libmysql_libs} ${MYSQL_LIBS}"
		60	+ ])
		61	+ fi
		62	+ done
		63	+
		64	+ if test -z "$MYSQL_LIBS"; then
65	+ AC_MSG_ERROR([Could not find MySQL client library])
66	+ fi
67
68	LDFLAGS="${_save_mysql_ldflags}"
0	1 diff -u -Nr zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 zabbix34-server/files/patch-m4-ax__lib__mysql.m4	69	1 diff -u -Nr zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 zabbix34-server/files/patch-m4-ax__lib__mysql.m4
1	2 --- zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 1970-01-01 10:00:00.000000000 +1000	70	2 --- zabbix34-server.org/files/patch-m4-ax__lib__mysql.m4 1970-01-01 10:00:00.000000000 +1000
2	3 +++ zabbix34-server/files/patch-m4-ax__lib__mysql.m4 2018-05-02 11:07:10.711107000 +1000	71	3 +++ zabbix34-server/files/patch-m4-ax__lib__mysql.m4 2018-05-02 11:07:10.711107000 +1000
3	4 @@ -0,0 +1,77 @@	72	4 @@ -0,0 +1,77 @@
4	5 +--- m4/ax_lib_mysql.m4.orig 2018-04-03 21:15:54.000000000 +1000	73	5 +--- m4/ax_lib_mysql.m4.orig 2018-04-03 21:15:54.000000000 +1000
5	6 ++++ m4/ax_lib_mysql.m4 2018-05-02 11:02:38.434851000 +1000	74	6 ++++ m4/ax_lib_mysql.m4 2018-05-02 11:02:38.434851000 +1000
6	7 +@@ -78,48 +78,53 @@	75	7 +@@ -78,48 +78,53 @@
7	8 +	76	8 +
8	9 + if test "$want_mysql" = "yes"; then	77	9 + if test "$want_mysql" = "yes"; then
9	10 +	78	10 +
10	11 +- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)	79	11 +- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config)
11	12 ++ AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])	80	12 ++ AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config])
12	13 +	81	13 +
13	14 + if test -x "$MYSQL_CONFIG"; then	82	14 + if test -x "$MYSQL_CONFIG"; then
14	15 + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"	83	15 + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
15	16 + _full_libmysql_libs="`$MYSQL_CONFIG --libs`"	84	16 + _full_libmysql_libs="`$MYSQL_CONFIG --libs`"
16	17 ++ _all_libmysql_libs=""	85	17 ++ _all_libmysql_libs=""
17	18 +	86	18 +
18	19 +- _save_mysql_ldflags="${LDFLAGS}"	87	19 +- _save_mysql_ldflags="${LDFLAGS}"
19	20 +- _save_mysql_cflags="${CFLAGS}"	88	20 +- _save_mysql_cflags="${CFLAGS}"
20	21 +- LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"	89	21 +- LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}"
21	22 +- CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"	90	22 +- CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
22	23 +	91	23 +
23	24 + for i in $_full_libmysql_libs; do	92	24 + for i in $_full_libmysql_libs; do
24	25 + case $i in	93	25 + case $i in
25	26 +- -lmysqlclient\|-lperconaserverclient\|-lmariadbclient\|-lmariadb)	94	26 +- -lmysqlclient\|-lperconaserverclient\|-lmariadbclient\|-lmariadb)
26	27 +-	95	27 +-
27	28 +- _lib_name="`echo "$i" \| cut -b3-`"	96	28 +- _lib_name="`echo "$i" \| cut -b3-`"
28	29 +- AC_CHECK_LIB($_lib_name, main, [	97	29 +- AC_CHECK_LIB($_lib_name, main, [
29	30 +- MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"	98	30 +- MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}"
30	31 +- ],[	99	31 +- ],[
31	32 +- AC_MSG_ERROR([Not found $_lib_name library])	100	32 +- AC_MSG_ERROR([Not found $_lib_name library])
32	33 +- ])	101	33 +- ])
33	34 +- ;;	102	34 +- ;;
34	35 + -L*)	103	35 + -L*)
35	36 +	104	36 +
36	37 + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"	105	37 + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i"
37	38 + ;;	106	38 + ;;
38	39 + -l*)	107	39 + -l*)
39	40 +-	108	40 +-
40	41 +- _lib_name="`echo "$i" \| cut -b3-`"	109	41 +- _lib_name="`echo "$i" \| cut -b3-`"
41	42 +- AC_CHECK_LIB($_lib_name, main, [	110	42 +- AC_CHECK_LIB($_lib_name, main, [
42	43 +- MYSQL_LIBS="${MYSQL_LIBS} ${i}"	111	43 +- MYSQL_LIBS="${MYSQL_LIBS} ${i}"
43	44 +- ],[	112	44 +- ],[
44	45 +- AC_MSG_ERROR([Not found $i library])	113	45 +- AC_MSG_ERROR([Not found $i library])
		114	CFLAGS="${_save_mysql_cflags}"
		115	unset _save_mysql_ldflags
		116	unset _save_mysql_cflags
		117	+ unset _full_libmysql_libs
		118	+ unset _all_libmysql_libs
		119	+ unset _client_lib_name
		120
		121	MYSQL_VERSION=`$MYSQL_CONFIG --version`
		122