Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chromebrew
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
chromebrew
Commits
0b897e85
Commit
0b897e85
authored
Nov 15, 2016
by
Kazushi (Jam) Marukawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add mechanism to strip "-m32" and substitute "lib32" into "lib"
for the case of ARM to avoid SHORTARCH flood.
parent
4a1f3a61
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
crew
crew
+1
-0
lib/package.rb
lib/package.rb
+6
-0
No files found.
crew
View file @
0b897e85
...
@@ -15,6 +15,7 @@ CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/'
...
@@ -15,6 +15,7 @@ CREW_CONFIG_PATH = CREW_PREFIX + '/etc/crew/'
CREW_BREW_DIR
=
CREW_PREFIX
+
'/tmp/crew/'
CREW_BREW_DIR
=
CREW_PREFIX
+
'/tmp/crew/'
CREW_DEST_DIR
=
CREW_BREW_DIR
+
'/dest'
CREW_DEST_DIR
=
CREW_BREW_DIR
+
'/dest'
ARCH
=
`uname -m | tr -d '
\n\r
'`
SHORTARCH
=
`getconf LONG_BIT | tr -d '
\n\r
'`
SHORTARCH
=
`getconf LONG_BIT | tr -d '
\n\r
'`
$LOAD_PATH
.
unshift
"
#{
CREW_LIB_PATH
}
lib"
$LOAD_PATH
.
unshift
"
#{
CREW_LIB_PATH
}
lib"
...
...
lib/package.rb
View file @
0b897e85
...
@@ -28,6 +28,12 @@ class Package
...
@@ -28,6 +28,12 @@ class Package
end
end
def
self
.
system
(
*
args
)
def
self
.
system
(
*
args
)
# strip -m32 option and convert lib32 to lib for the case of ARM to avoid SHORTARCH flood
if
ARCH
==
"armv7l"
args
=
args
.
map
{
|
s
|
s
.
gsub
(
"-m32"
,
""
)}
args
=
args
.
map
{
|
s
|
s
.
gsub
(
"lib32"
,
"lib"
)}
puts
*
args
end
Kernel
.
system
(
*
args
)
Kernel
.
system
(
*
args
)
exitstatus
=
$?
.
exitstatus
exitstatus
=
$?
.
exitstatus
raise
InstallError
.
new
(
"`
#{
args
.
join
(
" "
)
}
` exited with
#{
exitstatus
}
"
)
unless
exitstatus
==
0
raise
InstallError
.
new
(
"`
#{
args
.
join
(
" "
)
}
` exited with
#{
exitstatus
}
"
)
unless
exitstatus
==
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment