libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

build fixes for rpm - centos 5/6 don't know m4_esyscmd_s

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-07-29 11:22:15 +00:00
parent b6bc598e5c
commit 7729557716
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ax_init_standard_project.m4
View File

@@ -5,7 +5,7 @@
# define least version number from subversion's revision number: # define least version number from subversion's revision number:
# it is taken modulo 256 due to a bug on Apple's MacOSX # it is taken modulo 256 due to a bug on Apple's MacOSX
m4_define(x_least, m4_esyscmd_s( m4_define(x_least, m4_esyscmd([
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
for path in . .. ../..; do for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then if svn info $path 2>&1 > /dev/null; then
@@ -16,11 +16,11 @@ m4_define(x_least, m4_esyscmd_s(
done done
# Mac does not support LEAST > 255 # Mac does not support LEAST > 255
echo $ECHO_N $(($SVN_REVISION%256)) echo $ECHO_N $(($SVN_REVISION%256))
)) ]))
# define version number from subversion's revision number: # define version number from subversion's revision number:
# it is taken modulo 256 due to a bug on Apple's MacOSX # it is taken modulo 256 due to a bug on Apple's MacOSX
# add to x_minor if revision number is > 256 # add to x_minor if revision number is > 256
m4_define(x_minor_fixed, m4_esyscmd_s( m4_define(x_minor_fixed, m4_esyscmd([
SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout" SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
for path in . .. ../..; do for path in . .. ../..; do
if svn info $path 2>&1 > /dev/null; then if svn info $path 2>&1 > /dev/null; then
@@ -31,17 +31,17 @@ m4_define(x_minor_fixed, m4_esyscmd_s(
done done
# Mac does not support LEAST > 255 # Mac does not support LEAST > 255
echo $ECHO_N $((x_minor+$SVN_REVISION/256)) echo $ECHO_N $((x_minor+$SVN_REVISION/256))
)) ]))
# setup version number # setup version number
m4_define(x_version, m4_esyscmd_s( m4_define(x_version, m4_esyscmd([
echo $ECHO_N x_major.x_minor_fixed.x_least echo $ECHO_N x_major.x_minor_fixed.x_least
)) ]))
## bugreport mail address is taken from <user@host> in first line of AUTHORS ## bugreport mail address is taken from <user@host> in first line of AUTHORS
m4_define(x_bugreport, m4_esyscmd_s( m4_define(x_bugreport, m4_esyscmd([
head -1 AUTHORS | \ head -1 AUTHORS | \
sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp' sed -n 's,.*<\([-_.a-z0-9A-Z]*@[-_.a-z0-9A-Z]*\)>.*,\1,gp'
)) ]))
m4_include(ax_check_qt.m4) m4_include(ax_check_qt.m4)

2
mrw-c++.spec.in
View File

@@ -11,7 +11,7 @@ BuildRequires: graphviz
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
BuildRequires: pkgconfig, cppunit-devel, redhat-lsb BuildRequires: pkgconfig, cppunit-devel, redhat-lsb, subversion-svn2cl
%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
BuildRequires: mscgen BuildRequires: mscgen
%endif %endif