[前][次][番号順一覧][スレッド一覧]

ruby-changes:33951

From: nobu <ko1@a...>
Date: Wed, 21 May 2014 11:42:48 +0900 (JST)
Subject: [ruby-changes:33951] nobu:r46032 (trunk): configure.in: Info.plist workaround

nobu	2014-05-21 11:42:33 +0900 (Wed, 21 May 2014)

  New Revision: 46032

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46032

  Log:
    configure.in: Info.plist workaround
    
    * configure.in: workaround for Info.plist to get rid of `dsymutil`
      crash by wrong files in parent directories.
      [ruby-core:62594] [Bug #9840]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 46031)
+++ configure.in	(revision 46032)
@@ -691,13 +691,22 @@ RUBY_WERROR_FLAG([ https://github.com/ruby/ruby/blob/trunk/configure.in#L691
 	]
     )
     AC_MSG_CHECKING([whether LDFLAGS is valid])
+    {
+	mkdir tmp.$$.try_link &&
+	cd tmp.$$.try_link &&
+	cp ../confdefs.h . &&
+	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
+	:
+    } || AC_MSG_ERROR([faild to make temporary directory])
     AC_TRY_LINK([], [],
 	[AC_MSG_RESULT(yes)],
 	[
+	cd .. && rm -fr tmp.$$.try_link
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
 	]
     )
+    cd .. && rm -fr tmp.$$.try_link
 ])
 
 AC_DEFUN(RUBY_TRY_CFLAGS, [
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 46031)
+++ ChangeLog	(revision 46032)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed May 21 11:42:31 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: workaround for Info.plist to get rid of `dsymutil`
+	  crash by wrong files in parent directories.
+	  [ruby-core:62594] [Bug #9840]
+
 Tue May 20 20:57:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* test/ruby/test_dir.rb (test_glob): added testcase of double

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]