libelf: Fix portability issues

This commit is contained in:
Dylan Araps 2020-05-26 18:17:04 +03:00
parent cad084b098
commit 74b0ee8751
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E

View File

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
# #
# Word splitting (for CPPFLAGS, CC, etc) is sadly required. # Word splitting (for CFLAGS, CC, etc) is sadly required.
# shellcheck disable=2086 # shellcheck disable=2086
# #
# This package used to provide the old 'libelf' library. This had a sane # This package used to provide the old 'libelf' library. This had a sane
@ -15,7 +15,7 @@
# elftoolchain requires BSD make to build. Rather than package BSD make, # elftoolchain requires BSD make to build. Rather than package BSD make,
# let's just do the equivalent ourselves in shell. This is fairly simple # let's just do the equivalent ourselves in shell. This is fairly simple
# as all we're building is 'libelf' and not the entire toolchain. # as all we're building is 'libelf' and not the entire toolchain.
export CPPFLAGS="-fPIC -O2 $CPPFLAGS" export CFLAGS="-fPIC -O2 $CFLAGS"
export LDFLAGS="-shared $LDFLAGS" export LDFLAGS="-shared $LDFLAGS"
# Patch unneeded in next release. # Patch unneeded in next release.
@ -31,14 +31,14 @@ done
# Create all objects (.o). # Create all objects (.o).
for file in libelf/*.c; do for file in libelf/*.c; do
${CC:-cc} -I./libelf -I./common $LDFLAGS $CPPFLAGS -c \ ${CC:-cc} -I./libelf -I./common $LDFLAGS $CFLAGS $CPPFLAGS -c \
-o "${file%%.c}.o" "$file" -o "${file%%.c}.o" "$file"
done done
mkdir -p "$1/usr/lib" mkdir -p "$1/usr/lib"
# Create shared library. # Create shared library.
${CC:-cc} $LDFLAGS $CPPFLAGS -I./libelf -I./common libelf/*.o \ ${CC:-cc} $LDFLAGS $CFLAGS $CPPFLAGS -I./libelf -I./common libelf/*.o \
-o "$1/usr/lib/libelf.so.1" -o "$1/usr/lib/libelf.so.1"
# Create static library. # Create static library.