gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[build] Add workaround for SBJ HAL headers. JB#42564

Browse source 
Workaround for multiple definitions of variables from SBJ HAL headers.
This commit is contained in:
Juho Hämäläinen 2018-08-15 14:50:12 +03:00
parent 09085a8d38
commit 317791c166
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -296,6 +296,12 @@ if test "x$droiddevice" != x ; then
AC_SUBST([DROID_DEVICE_CFLAGS])
fi
# Workaround for SBJ HAL headers
if test "x$droiddevice" = xsbj ; then
SBJ_DEVICE_LDFLAGS="-Wl,--allow-multiple-definition"
AC_SUBST([SBJ_DEVICE_LDFLAGS])
fi
AC_MSG_CHECKING([If we are using hardfp tool chain])
case `echo | gcc -v -xc -o - - 2>&1 | grep COLLECT_GCC_OPTIONS | tail -1` in
*float-abi=hard*) hardfp=yes; AC_MSG_RESULT([yes]) ;;

2
src/common/Makefile.am
View file

@ -15,6 +15,6 @@ AM_CFLAGS = \
modlibexec_LTLIBRARIES = libdroid-util.la
libdroid_util_la_SOURCES = droid-util.c droid-config.c conversion.c config-parser-legacy.c config-parser-xml.c
libdroid_util_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common
libdroid_util_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common $(SBJ_DEVICE_LDFLAGS)
libdroid_util_la_LIBADD = $(AM_LIBADD)
libdroid_util_la_CFLAGS = $(AM_CFLAGS)