diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-05-25 20:37:37 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2022-05-25 20:37:37 +0200 |
| commit | c1ee86e85c638f672ccc71faf603d7a9deda05f3 (patch) | |
| tree | ce55652773999652b10bcc097032d8c7344253f3 /tools | |
| parent | Fix regression on stop_ping in clustering context (thanks to fdie)(#3817) (diff) | |
make-binaries: Fix linking of EIMP dependencies
Avoid linker errors such as the following when using GCC 10 or newer:
| multiple definition of `gdImageCreateFromJpegPtr'
See: https://gcc.gnu.org/gcc-10/porting_to.html
Fixes #3514.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-binaries | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/make-binaries b/tools/make-binaries index a15a9422..8ce85c9b 100755 --- a/tools/make-binaries +++ b/tools/make-binaries @@ -728,11 +728,11 @@ build_rel() info "Building $rel_name $rel_vsn for $arch ..." ./autogen.sh - eimp_defs='-DHAVE_GD -DHAVE_WEBP -DHAVE_JPEG -DHAVE_PNG' + eimp_cflags='-fcommon' eimp_libs='-lwebp -ljpeg -lpng -lz -lm' export CC="$CC -Wl,-ldl" # Required by (statically linking) epam. export LIBS="$eimp_libs -lcrypto -lpthread -ldl" - export CFLAGS="$CFLAGS $eimp_defs" + export CFLAGS="$CFLAGS $eimp_cflags" export LDFLAGS="$LDFLAGS $eimp_libs" if [ "$mode" = 'cross' ] then |