diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:01:18 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:01:18 -0500 |
| commit | d2bf9b8827eda5b57341c8a2013314b822b09671 (patch) | |
| tree | 5366a97eab6c8185a38ae4664685274f5cfdaf34 | |
| parent | ee25a4327d01300b38cc584131c45829532066af (diff) | |
| download | cygwin-filesystem-d2bf9b8827eda5b57341c8a2013314b822b09671.tar.gz cygwin-filesystem-d2bf9b8827eda5b57341c8a2013314b822b09671.tar.xz cygwin-filesystem-d2bf9b8827eda5b57341c8a2013314b822b09671.zip | |
Add cppflags, ldflags variables
| -rw-r--r-- | cygwin-filesystem.spec | 7 | ||||
| -rw-r--r-- | macros.cygwin32 | 14 | ||||
| -rw-r--r-- | macros.cygwin64 | 14 |
3 files changed, 23 insertions, 12 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index a70cce3..8bf1f29 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: cygwin-filesystem -Version: 11 -Release: 3%{?dist} +Version: 12 +Release: 1%{?dist} Summary: Cygwin cross compiler base filesystem and environment Group: Development/Libraries @@ -246,6 +246,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %changelog +* Thu Jun 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 12-1 +- Add cppflags, ldflags variables + * Wed Jun 10 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 11-3 - Place the RPM macros in /usr/lib/rpm/macros.d when using a modern RPM diff --git a/macros.cygwin32 b/macros.cygwin32 index 7330796..d3042cf 100644 --- a/macros.cygwin32 +++ b/macros.cygwin32 @@ -23,7 +23,9 @@ # Build macros. %cygwin32_host %{cygwin32_target} -%cygwin32_cflags -O2 -g -pipe -Wall +%cygwin32_cflags %{cygwin32_cppflags} -O2 -g -pipe -Wall +%cygwin32_cppflags %{nil} +%cygwin32_ldflags %{nil} %cygwin32_cc %{cygwin32_target}-gcc %cygwin32_cxx %{cygwin32_target}-g++ @@ -88,16 +90,18 @@ package or when debugging this package. \ declare -x $x="$i" ; export $x; \ done; \ unset _PREFIX; \ - CC="${cygwin_CC:-%cygwin32_cc}"; export CC; \ - CFLAGS="${cygwin_CFLAGS:-%cygwin32_cflags}"; export CFLAGS; \ + CC="${CYGWIN32_CC:-%cygwin32_cc}"; export CC; \ + CFLAGS="${CYGWIN32_CFLAGS:-%cygwin32_cflags}"; export CFLAGS; \ + CPPFLAGS="${CYGWIN32_CPPFLAGS:-%cygwin32_cppflags}"; export CPPFLAGS; \ if [ -x "%{_bindir}/%{cygwin32_cxx}" ]; then \ - CXX="${cygwin_CXX:-%cygwin32_cxx}"; export CXX; \ - CXXFLAGS="${cygwin_CXXFLAGS:-%cygwin32_cflags}"; export CXXFLAGS; \ + CXX="${CYGWIN32_CXX:-%cygwin32_cxx}"; export CXX; \ + CXXFLAGS="${CYGWIN32_CXXFLAGS:-%cygwin32_cflags}"; export CXXFLAGS; \ else \ CXX=; export CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ CXXFLAGS=; export CXXFLAGS; \ fi; \ + LDFLAGS="${CYGWIN32_LDFLAGS:-%cygwin32_ldflags}"; export LDFLAGS; \ for i in `ls %{_bindir}/*|grep -- "[-_]config\$"` ; do \ case $i in *pkg-config) continue ; esac ; \ x=`basename $i|tr "a-z+-\." "A-ZX__"`; \ diff --git a/macros.cygwin64 b/macros.cygwin64 index 92b0d83..30df8e9 100644 --- a/macros.cygwin64 +++ b/macros.cygwin64 @@ -23,7 +23,9 @@ # Build macros. %cygwin64_host %{cygwin64_target} -%cygwin64_cflags -O2 -g -pipe -Wall +%cygwin64_cflags %{cygwin64_cppflags} -O2 -g -pipe -Wall +%cygwin64_cppflags %{nil} +%cygwin64_ldflags %{nil} %cygwin64_cc %{cygwin64_target}-gcc %cygwin64_cxx %{cygwin64_target}-g++ @@ -89,16 +91,18 @@ package or when debugging this package. \ declare -x $x="$i" ; export $x; \ done; \ unset _PREFIX; \ - CC="${cygwin_CC:-%cygwin64_cc}"; export CC; \ - CFLAGS="${cygwin_CFLAGS:-%cygwin64_cflags}"; export CFLAGS; \ + CC="${CYGWIN64_CC:-%cygwin64_cc}"; export CC; \ + CFLAGS="${CYGWIN64_CFLAGS:-%cygwin64_cflags}"; export CFLAGS; \ + CPPFLAGS="${CYGWIN64_CPPFLAGS:-%cygwin64_cppflags}"; export CPPFLAGS; \ if [ -x "%{_bindir}/%{cygwin64_cxx}" ]; then \ - CXX="${cygwin_CXX:-%cygwin64_cxx}"; export CXX; \ - CXXFLAGS="${cygwin_CXXFLAGS:-%cygwin64_cflags}"; export CXXFLAGS; \ + CXX="${CYGWIN64_CXX:-%cygwin64_cxx}"; export CXX; \ + CXXFLAGS="${CYGWIN64_CXXFLAGS:-%cygwin64_cflags}"; export CXXFLAGS; \ else \ CXX=; export CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ CXXFLAGS=; export CXXFLAGS; \ fi; \ + LDFLAGS="${CYGWIN64_LDFLAGS:-%cygwin64_ldflags}"; export LDFLAGS; \ for i in `ls %{_bindir}/*|grep -- "[-_]config\$"` ; do \ case $i in *pkg-config) continue ; esac ; \ x=`basename $i|tr "a-z+-\." "A-ZX__"`; \ |