From 2986a59faba6f0d4bbf4f14e351bad3f51aaa506 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Thu, 24 Aug 2006 01:21:41 +0000
Subject: [PATCH] Okay, there are 3 reasons why I'm doing this.
1) Solaris sed doesn't have -r, which means things like \s and \S don't work.
2) GNU sed version 4.1.2 failed on a very simple test
echo "Test Test" | sed -r -e 's/\s/x/g'
should have returned "TestxxxTest", but did not (however, 4.1.4 did?).
3) The CFLAGS were never set, so that entire line actually did nothing. Now it's useful again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
Makefile | 2 +-
build_tools/mkpkgconfig | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index c5bade7138..7ebf890813 100644
--- a/Makefile
+++ b/Makefile
@@ -331,7 +331,7 @@ distclean: clean
rm -f build_tools/menuselect-deps
datafiles: all
- if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
diff --git a/build_tools/mkpkgconfig b/build_tools/mkpkgconfig
index 0ae2a24bf9..bc04f75619 100755
--- a/build_tools/mkpkgconfig
+++ b/build_tools/mkpkgconfig
@@ -15,11 +15,11 @@ fi
## Clean out CFLAGS for the spec file.
-LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
- sed -r -e 's/-I(include|\.\.\/include) //g' | \
- sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
- sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
- sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/[[:space:]]*-pipe[[:space:]]*//g' | sed -e 's/-[Wmp][^[:space:]]*[[:space:]]*//g' | \
+ sed -e 's/-I\(include|\.\.\/include\) //g' | \
+ sed -e 's/-DINSTALL_PREFIX=[^[:space:]]* //g' | \
+ sed -e 's/-DASTERISK_VERSION=[^[:space:]]* //g' | \
+ sed -e 's/-DAST\(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR\)=[^[:space:]]* //g'`
cat <<EOF > $PPATH/asterisk.pc
--
GitLab