Skip to content

E
etersoft-build-utils
Commit 1bd0d572 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

add TARGETARCH support

parent c9b138fd
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
share/eterbuild/functions/config
View file @ 1bd0d572
...@@ -23,6 +23,7 @@ uname -m | grep -q "i.86" && SYSARCH=i586 ...@@ -23,6 +23,7 @@ uname -m | grep -q "i.86" && SYSARCH=i586
# set default target arch # set default target arch
[ -n "$BUILDARCH" ] || BUILDARCH=$SYSARCH [ -n "$BUILDARCH" ] || BUILDARCH=$SYSARCH
[ -n "$TARGETARCH" ] || TARGETARCH=$BUILDARCH
NICE="nice" NICE="nice"
RPMBUILD=rpmbuild RPMBUILD=rpmbuild
......
share/eterbuild/functions/repl
View file @ 1bd0d572
...@@ -12,7 +12,8 @@ filter_deb_pkgnames() ...@@ -12,7 +12,8 @@ filter_deb_pkgnames()
build32on64() build32on64()
{ {
# FIXME: wine hack, use external replacement package list # FIXME: wine hack, use external replacement package list
[ "$BUILDARCH" = "x86_64" ] && rhas "$BUILDNAME" wine #[ "$BUILDARCH" = "x86_64" ] && rhas "$BUILDNAME" wine
[ "$TARGETARCH" = "i586" ] && [ "$BUILDARCH" = "x86_64" ]
} }
# Hack for improve requires for 32-bit build on 64-bit system # Hack for improve requires for 32-bit build on 64-bit system
...@@ -258,7 +259,7 @@ print_grprepl_list() ...@@ -258,7 +259,7 @@ print_grprepl_list()
# call with package list # call with package list
convert_pkgreqs_to_target() convert_pkgreqs_to_target()
{ {
assert_var DISTRVENDOR BUILDARCH PKGFORMAT assert_var DISTRVENDOR BUILDARCH TARGETARCH PKGFORMAT
local repl_list local repl_list
repl_list=$(print_pkgrepl_list) repl_list=$(print_pkgrepl_list)
LISTUSEDPKGREPL='' LISTUSEDPKGREPL=''
......
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