Skip to content

E
etersoft-build-utils
You need to sign in or sign up before continuing.
Commit b6f16dbb authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbph: add support for CentOS build 32 on 64 bit

parent 9044aa73
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
bin/rpmbph
View file @ b6f16dbb
...@@ -80,6 +80,8 @@ else ...@@ -80,6 +80,8 @@ else
if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then
[ "$DISTRNAME" = "Debian" ] && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs" [ "$DISTRNAME" = "Debian" ] && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
[ "$DISTRNAME" = "Ubuntu" ] && ! version_more_version $DISTRVERSION 12.04 ] && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs" [ "$DISTRNAME" = "Ubuntu" ] && ! version_more_version $DISTRVERSION 12.04 ] && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
[ "$DISTRNAME" = "CentOS" ] && version_more_version $DISTRVERSION 6 ] && BUILDREQ="$BUILDREQ glibc-devel.i686"
[ "$DISTRNAME" = "Scientific" ] && version_more_version $DISTRVERSION 6 ] && BUILDREQ="$BUILDREQ glibc-devel.i686"
fi fi
# Hack for allow repack on x86_64 packages with ExclusiveArch: %{ix586} # Hack for allow repack on x86_64 packages with ExclusiveArch: %{ix586}
......
share/eterbuild/functions/repl
View file @ b6f16dbb
...@@ -19,7 +19,7 @@ add_32bit_requires() ...@@ -19,7 +19,7 @@ add_32bit_requires()
# Only for build wine on x86_64 # Only for build wine on x86_64
if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then if [ "$BUILDARCH" = "x86_64" ] && echo $BUILDNAME | grep -q wine ; then
if [ "$DISTRNAME" = "Fedora" ] ; then if [ "$DISTRNAME" = "Fedora" ] || [ "$DISTRNAME" = "Scientific" ] || [ "$DISTRNAME" = "CentOS" -a "$DISTRVERSION" != 5 ]; then
# http://www.rpm.org/wiki/PackagerDocs/ArchDependencies # http://www.rpm.org/wiki/PackagerDocs/ArchDependencies
# add (x86-32) to all -devel packages # add (x86-32) to all -devel packages
for i in $* ; do for i in $* ; do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment