Author: mjordan Date: Wed Jan 14 09:34:16 2015 New Revision: 430589 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430589 Log: build_tools/mkpkgconfig: Fix Cflags concatenation error in asterisk.pc
The mkpkgconfig script incorrectly concatenates Cflags options together. As an example, the following: Cflags: -I/usr/include/libxml2 -g3 Is instead generated as: Cflags: -I/usr/include/libxml2-g3 This patch corrects the generation of Cflags in mkpkgconfig such that the Cflags options are output correctly. Review: https://reviewboard.asterisk.org/r/3707/ ASTERISK-23991 #close Reported by: Diederik de Groot patches: fix_mkpkgconfig.diff uploaded by Diederik de Groot (License 6600) Modified: branches/11/build_tools/mkpkgconfig Modified: branches/11/build_tools/mkpkgconfig URL: http://svnview.digium.com/svn/asterisk/branches/11/build_tools/mkpkgconfig?view=diff&rev=430589&r1=430588&r2=430589 ============================================================================== --- branches/11/build_tools/mkpkgconfig (original) +++ branches/11/build_tools/mkpkgconfig Wed Jan 14 09:34:16 2015 @@ -21,13 +21,12 @@ fi ## Clean out CFLAGS for the spec file. - -LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \ - ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \ +LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \ + ${EXTREGEX} 's/\s+-I(include|\.\.\/include)\s+/ /g' | \ ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \ ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \ - ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'` - + ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g' | \ + ${EXTREGEX} 's/^\s|\s$//g'` cat <<EOF > "$PPATH/asterisk.pc" install_prefix=$INSTALL_PREFIX -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
