ruby-changes:15153
From: mame <ko1@a...>
Date: Wed, 24 Mar 2010 23:02:37 +0900 (JST)
Subject: [ruby-changes:15153] Ruby:r27032 (trunk): * configure.in: revert the previous commit, which seemed to break make
mame 2010-03-24 23:01:57 +0900 (Wed, 24 Mar 2010) New Revision: 27032 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27032 Log: * configure.in: revert the previous commit, which seemed to break make install. The files of standard libraries are directly installed to $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1 Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 27031) +++ configure.in (revision 27032) @@ -1708,27 +1708,27 @@ rb_cv_dlopen=yes], [sysv4*], [ : ${LDSHARED='ld -G'} rb_cv_dlopen=yes], - [nto-qnx*], [ : ${LDSHARED='$(CC) -shared'} - rb_cv_dlopen=yes], + [nto-qnx*], [ : ${LDSHARED="qcc -shared"} + rb_cv_dlopen=yes], [esix*|uxpds*], [ : ${LDSHARED="ld -G"} rb_cv_dlopen=yes], [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes], [bsdi3*], [ AS_CASE(["$CC"], - [*shlicc*], [ : ${LDSHARED='$(CC) -r'} + [*shlicc*], [ : ${LDSHARED="$CC -r"} rb_cv_dlopen=yes])], [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ - : ${LDSHARED='$(CC) -shared'} + : ${LDSHARED='${CC} -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes], - [interix*], [ : ${LDSHARED='$(CC) -shared'} + [interix*], [ : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ - : ${LDSHARED='$(CC) -shared'} + : ${LDSHARED="$CC -shared"} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -1736,18 +1736,18 @@ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes], - [openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} + [openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi rb_cv_dlopen=yes], - [nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'} + [nextstep*], [ : ${LDSHARED='cc -r -nostdlib'} LDFLAGS="$LDFLAGS -u libsys_s" rb_cv_dlopen=yes], - [openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} + [openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], - [rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} + [rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} @@ -1812,13 +1812,13 @@ LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" rb_cv_dlopen=yes], [cygwin*|mingw*], [ - : ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'} + : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'} XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" : ${LIBPATHENV=""} rb_cv_dlopen=yes], [hiuxmpp], [ : ${LDSHARED='ld -r'}], - [atheos*], [ : ${LDSHARED='$(CC) -shared'} + [atheos*], [ : ${LDSHARED="$CC -shared"} rb_cv_dlopen=yes], [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" ], @@ -1839,7 +1839,6 @@ [ld" "*], [ ]) fi -AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`]) AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}]) AC_SUBST(LINK_SO) Index: ChangeLog =================================================================== --- ChangeLog (revision 27031) +++ ChangeLog (revision 27032) @@ -1,3 +1,9 @@ +Wed Mar 24 22:58:02 2010 Yusuke Endoh <mame@t...> + + * configure.in: revert the previous commit, which seemed to break make + install. The files of standard libraries are directly installed to + $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1 + Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@r...> * configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912] -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/