Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

make-binaries: Fix linking of EIMP dependencies

Browse Source 
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.
This commit is contained in:
Holger Weiss 2022-05-25 20:37:37 +02:00
parent 5a2e58e066
commit c1ee86e85c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/make-binaries
View File

@ -728,11 +728,11 @@ build_rel()
info "Building $rel_name $rel_vsn for $arch ..." info "Building $rel_name $rel_vsn for $arch ..."
./autogen.sh ./autogen.sh
eimp_defs='-DHAVE_GD -DHAVE_WEBP -DHAVE_JPEG -DHAVE_PNG' eimp_cflags='-fcommon'
eimp_libs='-lwebp -ljpeg -lpng -lz -lm' eimp_libs='-lwebp -ljpeg -lpng -lz -lm'
export CC="$CC -Wl,-ldl" # Required by (statically linking) epam. export CC="$CC -Wl,-ldl" # Required by (statically linking) epam.
export LIBS="$eimp_libs -lcrypto -lpthread -ldl" export LIBS="$eimp_libs -lcrypto -lpthread -ldl"
export CFLAGS="$CFLAGS $eimp_defs" export CFLAGS="$CFLAGS $eimp_cflags"
export LDFLAGS="$LDFLAGS $eimp_libs" export LDFLAGS="$LDFLAGS $eimp_libs"
if [ "$mode" = 'cross' ] if [ "$mode" = 'cross' ]
then then