kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (darwin): get rid of strange settings issue of

Browse source 
apple gcc port, which searches /usr/local/include always but
  /usr/local/lib not.

* ext/readline/readline.c (Init_readline): suppress warnings with
  libedit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-17 10:20:07 +00:00
parent 28028fc2b9
commit 67da4aebc5
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -1418,6 +1418,14 @@ if test "$with_dln_a_out" != yes; then
darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'} darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
: ${LIBPATHENV=DYLD_LIBRARY_PATH} : ${LIBPATHENV=DYLD_LIBRARY_PATH}
# /usr/local/include is always searched for
# some reason, but /usr/local/lib is not.
hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then
$CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
fi
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
aix*) if test "$GCC" = yes; then aix*) if test "$GCC" = yes; then
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='$(CC) -shared'}

4
ext/readline/readline.c
View file

@ -1176,7 +1176,7 @@ Init_readline()
VALUE history, fcomp, ucomp, version; VALUE history, fcomp, ucomp, version;
/* Allow conditional parsing of the ~/.inputrc file. */ /* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "Ruby"; rl_readline_name = (char *)"Ruby";
using_history(); using_history();
@ -1287,7 +1287,7 @@ Init_readline()
#else #else
{ {
HIST_ENTRY *entry = remove_history(0); HIST_ENTRY *entry = remove_history(0);
free(entry->line); free((char *)entry->line);
free(entry); free(entry);
} }
#endif #endif