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

ruby-changes:58950

From: Nobuyoshi <ko1@a...>
Date: Fri, 29 Nov 2019 10:42:45 +0900 (JST)
Subject: [ruby-changes:58950] 98006cea4f (master): Add dependency on bundled yaml.h when using

https://git.ruby-lang.org/ruby.git/commit/?id=98006cea4f

From 98006cea4fd517671dae508fade13203bc18301a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 29 Nov 2019 10:16:33 +0900
Subject: Add dependency on bundled yaml.h when using


diff --git a/ext/psych/depend b/ext/psych/depend
index 9f7d3a8..dc358ea 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -1,3 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/depend#L1
+$(OBJS): $(YAML_H)
+
 # AUTOGENERATED DEPENDENCIES START
 psych.o: $(RUBY_EXTCONF_H)
 psych.o: $(arch_hdrdir)/ruby/config.h
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 00f9982..a47e1dd 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -32,8 +32,11 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li https://github.com/ruby/ruby/blob/trunk/ext/psych/extconf.rb#L32
 
   find_header 'yaml.h'
   have_header 'config.h'
+  bundled = true
 end
 
-create_makefile 'psych'
+create_makefile 'psych' do |mk|
+  mk << "YAML_H =#{' yaml/yaml.h' if bundled}\n"
+end
 
 # :startdoc:
-- 
cgit v0.10.2


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

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