dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 783482 - Fail to link invert-svg in jhbuild prefix on FreeBSD... 

... because LDFLAGS is ignored.
Firstly let's make sure that invert-svg build uses LDFLAGS_FOR_BUILD and
CFLAGS_FOR_BUILD; secondly, default these to LDFLAGS and CFLAGS
respectively when not-cross-compiling, unless values are explicitly set.
This commit is contained in:
Jehan 2017-06-07 11:16:37 +02:00
parent 728aada6bb
commit 20fdb8dfa3
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -2134,6 +2134,17 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno")
# Check for vector icons
########################
# If not cross-compiling, default build's link and compile flags to the
# target's flags.
if test "$cross_compiling" != "yes"; then
if test "x$LDFLAGS_FOR_BUILD" = "x"; then
LDFLAGS_FOR_BUILD="$LDFLAGS"
fi
if test "x$CFLAGS_FOR_BUILD" = "x"; then
CFLAGS_FOR_BUILD="$CFLAGS"
fi
fi
AC_ARG_ENABLE(vector-icons, [ --disable-vector-icons use raster icons rather than vector ones (default=auto)], ,
enable_vector_icons=auto)

2
tools/Makefile.am
View File

@ -45,7 +45,7 @@ test_clipboard_LDADD = $(GTK_LIBS)
if ENABLE_VECTOR_ICONS
invert-svg$(BUILD_EXEEXT): invert-svg.c
$(CC_FOR_BUILD) -o $@ $< $(NATIVE_GLIB_LIBS) $(NATIVE_GLIB_CFLAGS)
$(CC_FOR_BUILD) -o $@ $< $(NATIVE_GLIB_LIBS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(NATIVE_GLIB_CFLAGS)
# compute_svg_viewbox is not built or used because librsvg is just too buggy