1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make pkg_config in mkmf include -I cflags in return value

Browse Source 
This was the historical behavior, it was modified unintentionally
by 097c3e9cbbf23718371f08c24b2d2297b039f63f, which started storing
these flags in a different global variable.

Also, include the incflags when logging, and document that the
method modifies $INCFLAGS.

Fixes [Bug #10651]
This commit is contained in:
Jeremy Evans 2019-07-07 20:16:57 -07:00
parent b6f07f748a
commit 325f7b6008
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mkmf.rb
View File

@ -1801,7 +1801,7 @@ SRC
# #
# Where {option} is, for instance, <code>--cflags</code>. # Where {option} is, for instance, <code>--cflags</code>.
# #
# The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and # The values obtained are appended to +$INCFLAGS+, +$CFLAGS+, +$LDFLAGS+ and
# +$libs+. # +$libs+.
# #
# If an <code>option</code> argument is given, the config command is # If an <code>option</code> argument is given, the config command is
@ -1857,9 +1857,9 @@ SRC
$LDFLAGS = [orig_ldflags, ldflags].join(' ') $LDFLAGS = [orig_ldflags, ldflags].join(' ')
Logging::message "package configuration for %s\n", pkg Logging::message "package configuration for %s\n", pkg
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", Logging::message "incflags: %s\ncflags: %s\nldflags: %s\nlibs: %s\n\n",
cflags, ldflags, libs incflags, cflags, ldflags, libs
[cflags, ldflags, libs] [[incflags, cflags].join(' '), ldflags, libs]
else else
Logging::message "package configuration for %s is not found\n", pkg Logging::message "package configuration for %s is not found\n", pkg
nil nil