Skip to content

Fix fakeroot build by using od(1) to check 64-bit ELFs #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JohnoKing wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix fakeroot build by using od(1) to check 64-bit ELFs #943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion bin/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,16 @@ int b(void) { return 0; }
echo 'int main(void) { return 0; }' > $tmp.a.c
checkcc
$cc $CCFLAGS -o $tmp.a.exe $tmp.a.c </dev/null >/dev/null 2>&1
file $tmp.a.exe 2>/dev/null | sed "s/$tmp\.a\.exe//g" )
file_result=$(file $tmp.a.exe 2>/dev/null | sed "s/$tmp\.a\.exe//g") || true
# Use od(1) to check the ELF header directly if file(1) failed
if test -z "$file_result" && test "$(uname -s | sed 's/-.*//')" != CYGWIN
then elfbyte=$(( $(od -An -t x1 -j 4 -N 1 $tmp.a.exe) ))
if test "$elfbyte" = 2
then echo "ELF 64-bit"
else echo "ELF 32-bit"
fi
else echo "$file_result"
fi )
case $bits in
*\ 64-bit* | *\ 64\ bit* | *\ 64bit*)
bits=64 ;;
Expand Down