From: <sil...@us...> - 2008-12-30 18:49:51
|
Revision: 1312 http://znc.svn.sourceforge.net/znc/?rev=1312&view=rev Author: silverleo Date: 2008-12-30 18:49:47 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Allow custom compiler flags for znc-buildmod via environment variables. Patch from flakes. Modified Paths: -------------- trunk/znc-buildmod.in Modified: trunk/znc-buildmod.in =================================================================== --- trunk/znc-buildmod.in 2008-12-30 13:05:04 UTC (rev 1311) +++ trunk/znc-buildmod.in 2008-12-30 18:49:47 UTC (rev 1312) @@ -42,9 +42,9 @@ exit 1 fi -CXXFLAGS=`${ZNC_CONFIG} --cflags` -INCLUDES=`${ZNC_CONFIG} --include` -LIBS=`${ZNC_CONFIG} --libs` +CXXFLAGS="`${ZNC_CONFIG} --cflags` $CXXFLAGS" +INCLUDES="`${ZNC_CONFIG} --include` $INCLUDES" +LIBS="`${ZNC_CONFIG} --libs` $LIBS" # Get the first word and strip away the first two chars (which is -I) INC_PATH=`echo ${INCLUDES} | ${SED} 's: .*::' | ${SED} 's:^..::'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2010-01-05 21:24:04
|
Revision: 1689 http://znc.svn.sourceforge.net/znc/?rev=1689&view=rev Author: psychon Date: 2010-01-05 21:23:58 +0000 (Tue, 05 Jan 2010) Log Message: ----------- znc-buildmod: Don't choke on spaces In shell scripts you always have to be careful about spaces. Better at some "" too much than one too few. Now spaces in the pathname for the module and spaces in some other paths should work correctly. Thanks to Nirjen for noticing this. Modified Paths: -------------- trunk/znc-buildmod.in Modified: trunk/znc-buildmod.in =================================================================== --- trunk/znc-buildmod.in 2010-01-05 21:20:53 UTC (rev 1688) +++ trunk/znc-buildmod.in 2010-01-05 21:23:58 UTC (rev 1689) @@ -25,8 +25,8 @@ fi } -check_binary ${SED} -check_binary ${ZNC_CONFIG} "Please (re)install ZNC." +check_binary "${SED}" +check_binary "${ZNC_CONFIG}" "Please (re)install ZNC." if test "x$CXX" = "x" ; then CXX=`${ZNC_CONFIG} --cxx` @@ -50,7 +50,7 @@ # Get the first word and strip away the first two chars (which is -I) INC_PATH=`echo ${INCLUDES} | ${SED} 's: .*::' | ${SED} 's:^..::'` -if test ! -d ${INC_PATH}; then +if test ! -d "${INC_PATH}"; then echo "${ERROR} Unable to find znc include dir [${INC_PATH}]. Please (re)install ZNC." exit 1 fi @@ -63,14 +63,14 @@ MOD="${FILE%.cpp}" MOD="${MOD%.cc}" - if test ! -f ${FILE}; then - echo "${ERROR} Building ${MOD}.so... File not found" + if test ! -f "${FILE}"; then + echo "${ERROR} Building \"${MOD}.so\"... File not found" else - printf "Building ${MOD}.so... " - if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} -shared -o ${MOD}.so ${FILE} ; then + printf "Building \"${MOD}.so\"... " + if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} -shared -o "${MOD}.so" "${FILE}" ; then echo "${OK}" else - echo "${ERROR} Error while building ${MOD}.so" + echo "${ERROR} Error while building \"${MOD}.so\"" exit 1 fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2010-01-05 21:35:24
|
Revision: 1690 http://znc.svn.sourceforge.net/znc/?rev=1690&view=rev Author: psychon Date: 2010-01-05 21:35:16 +0000 (Tue, 05 Jan 2010) Log Message: ----------- Remove the check for the include dir in znc-buildmod znc-config --include was removed in r1251 from Oct 2008. Ever since this check was broken and no one noticed. I guess this means no one needs this check... ;) Modified Paths: -------------- trunk/znc-buildmod.in Modified: trunk/znc-buildmod.in =================================================================== --- trunk/znc-buildmod.in 2010-01-05 21:23:58 UTC (rev 1689) +++ trunk/znc-buildmod.in 2010-01-05 21:35:16 UTC (rev 1690) @@ -43,18 +43,9 @@ fi CXXFLAGS="`${ZNC_CONFIG} --cflags` $CXXFLAGS" -INCLUDES="`${ZNC_CONFIG} --include` $INCLUDES" LIBS="`${ZNC_CONFIG} --libs` $LIBS" LDFLAGS="`${ZNC_CONFIG} --libznc` $LDFLAGS" -# Get the first word and strip away the first two chars (which is -I) -INC_PATH=`echo ${INCLUDES} | ${SED} 's: .*::' | ${SED} 's:^..::'` - -if test ! -d "${INC_PATH}"; then - echo "${ERROR} Unable to find znc include dir [${INC_PATH}]. Please (re)install ZNC." - exit 1 -fi - while test ! -z "$1" do FILE=$1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2010-01-07 20:51:27
|
Revision: 1695 http://znc.svn.sourceforge.net/znc/?rev=1695&view=rev Author: psychon Date: 2010-01-07 20:51:12 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Use znc-config to get --modlink in znc-buildmod This fixes znc-buildmod on Mac OS. Thanks to zynox for this patch and some other znc-related work! Modified Paths: -------------- trunk/znc-buildmod.in Modified: trunk/znc-buildmod.in =================================================================== --- trunk/znc-buildmod.in 2010-01-07 19:29:34 UTC (rev 1694) +++ trunk/znc-buildmod.in 2010-01-07 20:51:12 UTC (rev 1695) @@ -45,6 +45,7 @@ CXXFLAGS="`${ZNC_CONFIG} --cflags` $CXXFLAGS" LIBS="`${ZNC_CONFIG} --libs` $LIBS" LDFLAGS="`${ZNC_CONFIG} --libznc` $LDFLAGS" +MODLINK="`${ZNC_CONFIG} --modlink` $MODLINK" while test ! -z "$1" do @@ -58,7 +59,7 @@ echo "${ERROR} Building \"${MOD}.so\"... File not found" else printf "Building \"${MOD}.so\"... " - if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} -shared -o "${MOD}.so" "${FILE}" ; then + if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} ${MODLINK} -o "${MOD}.so" "${FILE}" ; then echo "${OK}" else echo "${ERROR} Error while building \"${MOD}.so\"" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |