зеркало из https://github.com/github/ruby.git
* configure.in, common.mk: AIX link issue. a patch from Yutaka
Kanemoto <kinpoco at gmail.com>. [ruby-dev:29190] * ext/socket/socket.c: AIX socket support. [ruby-dev:29190] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
275f12623d
Коммит
50ef220b5a
10
ChangeLog
10
ChangeLog
|
@ -1,6 +1,14 @@
|
||||||
|
Mon Aug 7 14:37:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* configure.in, common.mk: AIX link issue. a patch from Yutaka
|
||||||
|
Kanemoto <kinpoco at gmail.com>. [ruby-dev:29190]
|
||||||
|
|
||||||
|
* ext/socket/socket.c: AIX socket support. [ruby-dev:29190]
|
||||||
|
|
||||||
Mon Aug 7 12:05:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Mon Aug 7 12:05:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
|
* dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
|
||||||
|
a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
|
||||||
[ruby-dev:29191]
|
[ruby-dev:29191]
|
||||||
|
|
||||||
Sun Aug 6 20:34:24 2006 Tadayoshi Funaba <tadf@dotrb.org>
|
Sun Aug 6 20:34:24 2006 Tadayoshi Funaba <tadf@dotrb.org>
|
||||||
|
|
10
common.mk
10
common.mk
|
@ -75,16 +75,16 @@ miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(D
|
||||||
|
|
||||||
$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
|
$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
|
||||||
|
|
||||||
$(LIBRUBY_A): $(OBJS) $(DMYEXT)
|
$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE)
|
||||||
|
|
||||||
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE)
|
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP)
|
||||||
|
|
||||||
$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
|
$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
|
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
|
||||||
|
|
||||||
ruby.imp: $(LIBRUBY_A)
|
ruby.imp: $(OBJS)
|
||||||
@$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
|
@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
|
||||||
|
|
||||||
install: install-nodoc $(RDOCTARGET)
|
install: install-nodoc $(RDOCTARGET)
|
||||||
install-all: install-nodoc install-doc
|
install-all: install-nodoc install-doc
|
||||||
|
@ -121,6 +121,8 @@ do-install-doc: $(PROGRAM)
|
||||||
|
|
||||||
pre-install: pre-install-local pre-install-ext
|
pre-install: pre-install-local pre-install-ext
|
||||||
pre-install-local:: PHONY
|
pre-install-local:: PHONY
|
||||||
|
$(RM) $(prefix)/lib/$(LIBRUBY)
|
||||||
|
$(RM) -r $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)
|
||||||
pre-install-ext:: PHONY
|
pre-install-ext:: PHONY
|
||||||
pre-install-doc:: PHONY
|
pre-install-doc:: PHONY
|
||||||
|
|
||||||
|
|
30
configure.in
30
configure.in
|
@ -973,16 +973,20 @@ if test "$with_dln_a_out" != yes; then
|
||||||
: ${LDFLAGS=""}
|
: ${LDFLAGS=""}
|
||||||
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
|
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
|
||||||
rb_cv_dlopen=yes ;;
|
rb_cv_dlopen=yes ;;
|
||||||
aix*) : ${LDSHARED='/usr/ccs/bin/ld'}
|
aix*) if test "$GCC" = yes; then
|
||||||
XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
|
: ${LDSHARED='gcc -shared'}
|
||||||
DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
|
DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
|
||||||
LDFLAGS="-brtl $LDFLAGS"
|
LDFLAGS='-Wl,-brtl -Wl,-bE:ruby.imp'
|
||||||
: ${ARCHFILE="ruby.imp"}
|
else
|
||||||
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
|
: ${LDSHARED='/usr/ccs/bin/ld'}
|
||||||
TRY_LINK="$TRY_LINK"' $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
|
DLDFLAGS='-G -eInit_$(TARGET)'
|
||||||
: ${LIBPATHENV=SHLIB_PATH}
|
LDFLAGS="-brtl -bE:ruby.imp"
|
||||||
rb_cv_dlopen=yes ;;
|
fi
|
||||||
|
: ${ARCHFILE="ruby.imp"}
|
||||||
|
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
|
||||||
|
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
|
||||||
|
: ${LIBPATHENV=SHLIB_PATH}
|
||||||
|
rb_cv_dlopen=yes ;;
|
||||||
human*) : ${DLDFLAGS=''}
|
human*) : ${DLDFLAGS=''}
|
||||||
: ${LDSHARED=''}
|
: ${LDSHARED=''}
|
||||||
: ${LDFLAGS=''}
|
: ${LDFLAGS=''}
|
||||||
|
@ -1299,12 +1303,12 @@ if test "$enable_shared" = 'yes'; then
|
||||||
aix*)
|
aix*)
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
LIBRUBY_LDSHARED='$(CC) -shared'
|
LIBRUBY_LDSHARED='$(CC) -shared'
|
||||||
LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
|
LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
|
||||||
else
|
else
|
||||||
LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
|
LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
|
||||||
LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
|
LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
|
||||||
fi
|
fi
|
||||||
LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
|
LIBRUBYARG_SHARED='-L${libdir} -lruby'
|
||||||
SOLIBS='-lm -lc'
|
SOLIBS='-lm -lc'
|
||||||
;;
|
;;
|
||||||
beos*)
|
beos*)
|
||||||
|
|
|
@ -185,6 +185,12 @@ ruby_getaddrinfo__aix(char *nodename, char *servname,
|
||||||
}
|
}
|
||||||
#undef getaddrinfo
|
#undef getaddrinfo
|
||||||
#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
|
#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
|
||||||
|
#ifndef CMSG_SPACE
|
||||||
|
# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
|
||||||
|
#endif
|
||||||
|
#ifndef CMSG_LEN
|
||||||
|
# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __BEOS__
|
#ifdef __BEOS__
|
||||||
|
|
Загрузка…
Ссылка в новой задаче