aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
Commit message (Collapse)AuthorAgeFilesLines
* configure.in, mkmf.rb: sign extensionsnobu2012-12-101-3/+5
| | | | | | | | | | * configure.in (codesign): check identifier at link time, not configure time. * lib/mkmf.rb (LINK_SO): sign extensions too. replace empty line with default command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: fix r37294: run only on i[3-6]86-linux.naruse2012-11-281-0/+12
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: revert r37911, r37906 and r37904 which break buildngoto2012-11-281-11/+0
| | | | | | | | with non-gcc and/or non-IA32 compilers, e.g. Solaris Studio, Fujitsu C Compiler. [ruby-dev:46646] [Bug #7451] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Refix of r37904naruse2012-11-271-4/+14
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fix r37904: it forced i486 though -marh was usually i686naruse2012-11-271-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (opt-dir): don't use non portable flag -E of sed.naruse2012-11-271-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (ARCH_FLAG): __sync_val_compare_and_swap_4 needsnaruse2012-11-271-3/+4
| | | | | | -march=i486 on at least linux gcc 4.1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * process.c (proc_getsid): adds new method for getting session id.kosaki2012-11-241-1/+1
| | | | | | | | | | | Contributed from fumiyas (Fumiyasu SATOH). Thank you! [Feature #6757] [ruby-dev:45977] * configure.in: adds getsid check. * test/ruby/test_process.rb (TestProcess#test_setsid): new test for the above. * NEWS: news for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: --disable-dlnnobu2012-11-231-0/+5
| | | | | | | | * configure.in (--disable-dln): option to disable dynamic linking feature. [ruby-core:37676] [Feature #4946] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (RUBY_DTRACE_AVAILABLE): only check dtrace availability.naruse2012-11-201-28/+26
| | | | | | * configure.in (RUBY_DTRACE_POSTPROCESS): restore. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add extra line to prevent syntax errornaruse2012-11-201-0/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: fix dtrace didn't work on darwin.naruse2012-11-201-32/+23
| | | | | | | * configure.in (RUBY_DTRACE_AVAILABLE): unify RUBY_DTRACE_POSTPROCESS and RUBY_DTRACE_BSD_BROKEN. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (--enable-dtrace): always call RUBY_DTRACE_BSD_BROKENnaruse2012-11-201-9/+3
| | | | | | | | | | | | | | | | for portability. As the note, FreeBSD 8 has DTrace as the optional feature (it is enabled by the build option), but doesn't have USDT. FreeBSD 9 has USDT but they are still optional. FreeBSD 10 will enable them by default. The variable $rb_cv_prog_dtrace_g is "yes" only on FreeBSD 9 with optional DTrace or FreeBSD 10. If it is "no", you cannnot know whether it doesn't need -G or DTrace is disabled. (by cheking error code, you can know) * configure.in (--enable-dtrace): change help message git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Revert "* configure.in (--enable-dtrace): change help message"naruse2012-11-201-2/+6
| | | | | | | | This reverts commit 029b59ba53d0cc42630d623b52d94cae0df62734. When $rb_cv_prog_dtrace_g is yes on FreeBSD even if /usr/bin/dtrace exists, it means dtrace is disabled on the system. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (--enable-dtrace): change help messagengoto2012-11-191-6/+2
| | | | | | | | | * configure.in (--enable-dtrace): remove ineffective "else AS_CASE ..." because the variable $rb_cv_prog_dtrace_g is normally "yes" on FreeBSD and the AS_CASE is not evaluated on FreeBSD. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: no -lelfnobu2012-11-191-3/+3
| | | | | | * configure.in (LIBS): libelf is need on only FreeBSD. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: fix didn't enable_dtrace=yes on auto.naruse2012-11-191-5/+6
| | | | | | | | * configure.in: see enable_dtrace for adding libelf on FreeBSD. * common.mk: VPATH is not needed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.naruse2012-11-191-0/+4
| | | | | | | | * common.mk: fix path of probes.dmyh. * configure.in: FreeBSD's USDT requires libelf. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in, Makefile.in, common.mk: support DTrace on Solaris 10,ngoto2012-11-181-15/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | based on r26235 by Yugui. On Solaris 10, low optimization level may also be needed, e.g. optflags="-xO1" or "-xO0" with Oracle SolarisStudio 12.3 cc. * configure.in (--enable-dtrace): new option to enable/disable DTrace support. By default, trying to enable if dtrace command is found on the system. It is disabled when cross compiling. * configure.in (RUBY_DTRACE_POSTPROCESS): new macro. checks whether the dtrace on the system needs postprocessing with "dtrace -G". The postprocessing is needed on Solaris 10 and other platforms. * configure.in (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether the dtrace supports USDT. * configure.in (DTRACE): move after RUBY_DTRACE_POSTPROCESS. * configure.in (LD): On Solaris, /usr/ccs/bin/ld is preferred. * configure.in, Makefile.in, common.mk (DTRACE_OBJ): new macro for DTrace probe object generated by postprocessing with "dtrace -G". * Makefile.in, common.mk (probes.$(OBJEXT)): DTrace probe object generated by the postprocessing. New file probes.stamp is for rebuilding related objects that may be modified by "dtrace -G". * configure.in, Makefile.in, common.mk (DTRACE_GLOMMED_OBJ): new macro for DTrace static library hacks. * configure.in, Makefile.in (LIBRUBY_A_OBJS): ditto. * Makefile.in, common.mk (ruby-glommed.$(OBJEXT)): new target with rule for DTrace static library hacks. * common.mk (DTRACE_DEPENDENT_OBJS): objects depended on probes.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* probes.h: select by suffix rulesnobu2012-11-161-3/+3
| | | | | | | | * Makefile.in, common.mk, configure.in, win32/Makefile.sub (probes.h): select generating with dtrace or copying dummy file by suffix rules. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Makefile.in: split probes.h commandsnobu2012-11-161-0/+6
| | | | | | | | * Makefile.in (probes.h): split build commands for dtrace-available and unavailable platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: move after AC_PROG_CCnobu2012-11-161-8/+8
| | | | | | | * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling is set in it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: cross-compiling fixnobu2012-11-161-1/+4
| | | | | | | * configure.in (DTRACE): ignore non-prefixed version if cross-compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Fix dtrace commit r37631, it is [Feature #2565]naruse2012-11-131-0/+3
| | | | | | | | | | | | | | | * configure.in: disable dtrace because it doesn't work on FreeBSD. * common.mk (clean-local): rm probes.h. * common.mk (parse.o): depend $(PROBES_H_INCLUDES). * common.mk (.d.h): moved from Makefile.in and use BASERUBY. * tool/gen_dummy_probes.rb: reimplemented with ruby because sed is not available on Windows Microsoft VC++ environment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * re.c (rb_memsearch_ss): performance improvement by using memmem(3) ifglass2012-11-131-0/+36
| | | | | | | | possible. [ruby-dev:45530] [Feature #6311] * configure.in: check existence of memmem(3) and that it is not broken. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * probes.d: add DTrace probe declarations. [ruby-core:27448]tenderlove2012-11-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * array.c (empty_ary_alloc, ary_new): added array create DTrace probe. * compile.c (rb_insns_name): allowing DTrace probes to access instruction sequence name. * Makefile.in: translate probes.d file to appropriate header file. * common.mk: declare dependencies on the DTrace header. * configure.in: add a test for existence of DTrace. * eval.c (setup_exception): add a probe for when an exception is raised. * gc.c: Add DTrace probes for mark begin and end, and sweep begin and end. * hash.c (empty_hash_alloc): Add a probe for hash allocation. * insns.def: Add probes for function entry and return. * internal.h: function declaration for compile.c change. * load.c (rb_f_load): add probes for `load` entry and exit, require entry and exit, and wrapping search_required for load path search. * object.c (rb_obj_alloc): added a probe for general object creation. * parse.y (yycompile0): added a probe around parse and compile phase. * string.c (empty_str_alloc, str_new): DTrace probes for string allocation. * test/dtrace/*: tests for DTrace probes. * vm.c (vm_invoke_proc): add probes for function return on exception raise, hash create, and instruction sequence execution. * vm_core.h: add probe declarations for function entry and exit. * vm_dump.c: add probes header file. * vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on function entry and return. * vm_exec.c: expose instruction number to instruction name function. * vm_insnshelper.c: add function entry and exit probes for cfunc methods. * vm_insnhelper.h: vm usage information is always collected, so uncomment the functions. 12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org> * configure.in (isinf, isnan): isinf() and isnan() are macros on DragonFly which cannot be found by AC_REPLACE_FUNCS(). This workaround enforces the fact that they exist on DragonFly. 12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org> * vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo), vm_insnhelper.c (vm_search_method): revert r37616 because it's too slow. [ruby-dev:46477] * test/ruby/test_refinement.rb (test_inline_method_cache): skip the test until the bug is fixed efficiently. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Fix build on DragonFly where configure fails to detect isinf()/isnan().knu2012-11-121-0/+3
| | | | | | | | * configure.in (isinf, isnan): isinf() and isnan() are macros on DragonFly which cannot be found by AC_REPLACE_FUNCS(). This workaround enforces the fact that they exist on DragonFly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (--with-opt-dir): Avoid nesting of double quotesknu2012-11-081-1/+2
| | | | | | | | | inside backquotes, since some traditional shells like PD KSH (which OpenBSD's /bin/sh bases on) fails to parse them. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: no visibility option for older GCCnobu2012-10-231-1/+9
| | | | | | | | | * configure.in (visibility_option): visibility attribute is not available before GCC 4, so do not use -fvisibility option in that case. [ruby-core:48147] [Bug #7205] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: multiple opt-dirnobu2012-10-171-6/+12
| | | | | | | | | * configure.in (opt-dir): allow multiple directories separated by $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868] [Bug #7120] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * gc.c: Use the non-recursive marking instead of recursion. Thenari2012-10-031-56/+0
| | | | | | | | | | | | | | recursion marking of CRuby needs checking stack overflow and the fail-safe system, but these systems not good at partial points, for example, marking deep tree structures. [ruby-dev:46184] [Feature #7095] * configure.in (GC_MARK_STACKFRAME_WORD): removed. It's used by checking stack overflow of marking. * win32/Makefile.sub (GC_MARK_STACKFRAME_WORD): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (--with-opt-dir): Make this also work on DLDFLAGSknu2012-09-301-1/+3
| | | | | | | | so LIBRUBY_SO links fine with libexecinfo installed in a non-system directory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: warnflagsnobu2012-09-161-0/+1
| | | | | | | * configure.in (warnflags): needs to check configuration with strict options. [ruby-dev:46105] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: strict warnflagsnobu2012-09-151-2/+2
| | | | | | | | * configure.in (strict_warnflags): separate strict flags from warnflags only for core. [ruby-dev:46105] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: aix warnflagsnobu2012-09-151-1/+1
| | | | | | | * configure.in: append -qinfo option not overriding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: fix typo.eregon2012-09-141-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: no PIE on Haikunobu2012-09-131-1/+7
| | | | | | | * configure.in: Don't use PIE on Haiku because loader support is not enough. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: unquotenobu2012-09-011-1/+1
| | | | | | | * configure.in (LIBDIR_BASENAME): unquote shell variable. [ruby-core:47267] [Bug #6903] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: use configured libdir valuenobu2012-08-291-2/+9
| | | | | | | | | * configure.in (LIBDIR_BASENAME): use configured libdir value to fix --enable-load-relative on systems where libdir is not default value, overridden in config.site files. [ruby-core:47267] [Bug #6903] * ruby.c (ruby_init_loadpath_safe): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.naruse2012-08-281-2/+7
| | | | | | | | | | - omit ANSI standard flags to compile socket extension where anonymous union is required. - remove redundant -be flags. by Takashi Toyoshima <toyoshim@gmail.com> https://github.com/ruby/ruby/pull/168 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY)yugui2012-08-271-5/+1
| | | | | | | | | | | | | | | Rewrites these variables instead of PATH. NaCl port uses a toolchain which is specified by NACL_SDK_ROOT environment variable. Originally, NaCl build added the toolchain under the NACL_SDK_ROOT to the PATH. But updating PATH doesn't work on Mac. (RBCONFIG): Replaces configs with the variable updates above. * configure.in: Thus it is no longer necessary to check $PATH. Based on a patch by Takashi Toyoshima <toyoshim AT gmail.com>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Improve require/File.expand_path performance on Windowsluislavena2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.in (mingw): add shlwapi to the list of dependency libs for Windows. * win32/Makefile.sub (EXTSOLIBS): ditto. * internal.h: declare internal functions rb_w32_init_file, rb_file_expand_path_internal and rb_file_expand_path_fast. * file.c (Init_File): invoke Windows initialization rb_w32_init_file * win32/file.c (rb_file_load_path_internal): new function. Windows-specific implementation that replaces file_expand_path. [Bug #6836][ruby-core:46996] * win32/file.c (rb_w32_init_file): new function. Initialize codepage cache for faster conversion encodings lookup. * file.c (file_expand_path): rename to rb_file_expand_path_internal. Conditionally exclude from Windows. * file.c (rb_file_expand_path_fast): new function. delegates to rb_file_expand_path_internal without performing a hit to the filesystem. * file.c (file_expand_path_1): use rb_file_expand_path_internal without path expansion (used by require). * file.c (rb_find_file_ext_safe): ditto. * file.c (rb_find_file_safe): ditto. * load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast. * load.c (rb_feature_provided): ditto. * file.c (rb_file_expand_path): use rb_file_expand_path_internal with path expansion. * file.c (rb_file_absolute_path): ditto. * test/ruby/test_file_exhaustive.rb: new tests to exercise rb_file_expand_path_internal implementation and compliance with existing behaviors. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: Fixing Haiku build.naruse2012-08-231-3/+3
| | | | | | | | | | | - -lbe is not required for linking - stack protector doesn't work for now because of the default gcc's bug by Takashi Toyoshima <toyoshim@gmail.com> https://github.com/ruby/ruby/pull/167 * signal.c (ruby_signal): haiku doesn't have SIGBUS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: use the value of --with-opt-dir on building rubynaruse2012-08-231-16/+22
| | | | | | itself. [ruby-dev:46064] [Bug #6900] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in (ac_cv_func_shutdown): shutdown(2) has a dummyyugui2012-08-221-0/+1
| | | | | | | implementation but has no declaration and does not work in NativeClient SDK pepper_20. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: noral blocksnobu2012-08-211-12/+12
| | | | | | | * configure.in: use noral blocks instead of dnl, so that matching parentheses would match. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: escape #-marksnobu2012-08-211-5/+5
| | | | | | | * configure.in: escape #-marks, so that matching parentheses would match. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: no bare case statementnobu2012-08-211-6/+3
| | | | | | | * configure.in (RUBY_CHECK_SIZEOF): use single test instead of split bare case statement, so that matching parentheses would match. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* configure.in: use real pathnobu2012-08-091-1/+1
| | | | | | | * configure.in (MINIRUBY): use real path for include path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * configure.in: use gcc-4.2 prior to clang, gcc, and cc if exist fornaruse2012-08-051-1/+1
| | | | | | the use of Snow Leopard's old clang. see also r36594, r36610, r36611. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e