bb51d93e4200240fa397240d2161e48ec6406894 hiram Mon Aug 19 08:24:54 2013 -0700 adding -lstdc++ and -lrt to all MYSQLLIBS in case of MySQL v5.6 refs #9149 diff --git src/inc/common.mk src/inc/common.mk index a4eefc8..52b165a 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -117,30 +117,32 @@ endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /opt/local/lib/mysql55/mysql/libmysqlclient.a),) MYSQLLIBS=/opt/local/lib/mysql55/mysql/libmysqlclient.a endif endif ifeq ($(findstring src/hg/,${CURDIR}),src/hg/) ifeq (${MYSQLINC},) $(error can not find installed mysql development system) endif endif # last resort, hoping the compiler can find it in standard locations ifeq (${MYSQLLIBS},) MYSQLLIBS="-lmysqlclient" endif +# OK to add this to all MYSQLLIBS just in case it is MySQL version 5.6 libraries +MYSQLLIBS += -lstdc++ -lrt L+=${PNGLIB} HG_INC+=${PNGINCL} # 32-bit color enabled by default ifneq (${COLOR32},0) HG_DEFS+=-DCOLOR32 endif # autodetect UCSC installation of samtabix: ifeq (${SAMTABIXDIR},) SAMTABIXDIR = /hive/data/outside/samtabix/${MACHTYPE} ifneq ($(wildcard ${SAMTABIXDIR}),) ifeq (${USE_SAMTABIX},) USE_SAMTABIX=1 @@ -199,31 +201,30 @@ endif SYS = $(shell uname -s) FULLWARN = $(shell uname -n) ifeq (${HG_WARN},) ifeq (${SYS},Darwin) HG_WARN = -Wall -Wno-unused-variable HG_WARN_UNINIT= else ifeq (${SYS},SunOS) HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else ifeq (${FULLWARN},hgwdev) - MYSQLLIBS += -lstdc++ -lrt HG_WARN = -Wall -Werror -Wformat -Wformat-security -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized endif endif endif # -Wuninitialized generates a warning without optimization ifeq ($(findstring -O,${COPT}),-O) HG_WARN += ${HG_WARN_UNINIT} endif endif # this is to hack around many make files not including HG_WARN in