[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5156: Move CentOS CPPFLAGS hack to a more suitable place.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 16 Nov 2010 10:53:29 -0000
------------------------------------------------------------
revno: 5156
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-11-16 11:41:03 +0100
message:
Move CentOS CPPFLAGS hack to a more suitable place.
It's not good to clutter the specfile with platform-specific workarounds.
Instead, keep the workarounds in the script that controls building the
packages for specific platforms.
modified:
packaging/create-package.sh
packaging/hipl-rpm.spec
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'packaging/create-package.sh'
--- packaging/create-package.sh 2010-10-29 10:52:36 +0000
+++ packaging/create-package.sh 2010-11-16 10:41:03 +0000
@@ -109,6 +109,10 @@
PKG_INDEX_NAME=repodata
INDEXING_CMD=mkindex_rpm
PACKAGING_CMD=build_rpm
+ case $(lsb_release -d) in
+ "Description: CentOS release 5.5 (Final)")
+ export CPPFLAGS=-U__STRICT_ANSI__;;
+ esac
else
die "unknown distribution"
fi
=== modified file 'packaging/hipl-rpm.spec'
--- packaging/hipl-rpm.spec 2010-11-05 14:17:19 +0000
+++ packaging/hipl-rpm.spec 2010-11-16 10:41:03 +0000
@@ -29,11 +29,7 @@
# Note: CentOS 5.5 requires special cpp flags (see bug id #620327)
%build
autoreconf --install
-%if 0%{?fedora}
%configure --prefix=/usr --sysconfdir=/etc
-%else
-CPPFLAGS=-U__STRICT_ANSI__ ./configure --prefix=/usr --sysconfdir=/etc
-%endif
make -j
# Currently we are not going to install all includes and test software.
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5156: Move CentOS CPPFLAGS hack to a more suitable place. - noreply
