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

merged revision 21628:

Browse source 
* configure.in (darwin): get rid of strange settings issue of
	  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/branches/ruby_1_8@22079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-05 12:01:25 +00:00
parent 26ea147c05
commit 95b2261463
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Feb 5 21:01:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): get rid of strange settings issue of
apple gcc port, which searches /usr/local/include always but
/usr/local/lib not.
* ext/readline/readline.c (Init_readline): suppress warnings with
libedit.
Tue Feb 3 18:35:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/thread/thread.c (rb_queue_pop, rb_queue_push): should not lock

8
configure.in
View file

@ -1247,6 +1247,14 @@ if test "$with_dln_a_out" != yes; then
darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
: ${LDFLAGS=""}
: ${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 ;;
aix*) if test "$GCC" = yes; then
: ${LDSHARED='$(CC) -shared'}

2
ext/readline/readline.c
View file

@ -750,7 +750,7 @@ Init_readline()
VALUE history, fcomp, ucomp;
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "Ruby";
rl_readline_name = (char *)"Ruby";
using_history();