kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk (pkgconfig-data): moved from Makefile.in.

Browse source 
* tool/rbinstall.rb: install pc file only if non-empty.
  [ruby-core:32901] #3983

* win32/Makefile.sub (ruby_pc): create pc file.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-10-26 03:47:15 +00:00
parent fd74e1414c
commit 749ad16aa7
5 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Oct 26 12:47:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (pkgconfig-data): moved from Makefile.in.
* tool/rbinstall.rb: install pc file only if non-empty.
[ruby-core:32901] #3983
* win32/Makefile.sub (ruby_pc): create pc file.
Tue Oct 26 09:13:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_gcc_atomic_builtins): check for atomic

3
Makefile.in
View file

@ -179,8 +179,7 @@ $(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
@chmod +x $@
ruby_pc = @ruby_pc@
pkgconfig-data: $(ruby_pc)
$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
$(ruby_pc):
@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \

2
common.mk
View file

@ -181,6 +181,8 @@ ruby.imp: $(EXPORTOBJS)
install: install-$(INSTALLDOC)
docs: $(DOCTARGETS)
pkgconfig-data: $(ruby_pc)
$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
install-all: docs pre-install-all do-install-all post-install-all
pre-install-all:: pre-install-local pre-install-ext pre-install-doc

2
tool/rbinstall.rb
View file

@ -340,7 +340,7 @@ end
install?(:local, :arch, :data) do
pc = CONFIG["ruby_pc"]
if File.exist?(pc)
if pc and File.file?(pc) and File.size?(pc)
prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
install pc, pkgconfigdir, :mode => $data_mode
end

9
win32/Makefile.sub
View file

@ -339,6 +339,7 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
VCS = git
VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
@ -772,6 +773,7 @@ s,@configure_input@,$$configure_input,;t t
s,@srcdir@,$(srcdir),;t t
s,@top_srcdir@,$(srcdir),;t t
s,@try_header@,try_compile,;t t
s,@ruby_pc@,$(ruby_pc),;t t
<<KEEP
miniruby: miniruby$(EXEEXT)
@ -896,6 +898,13 @@ class File
end
<<KEEP
$(ruby_pc): $(RBCONFIG)
@$(MINIRUBY) -rrbconfig -p \
-e '$$_.gsub!(/@([a-z_]\w*)@/i) {' \
-e 'RbConfig::MAKEFILE_CONFIG[$$1].gsub(/\$$\((.+?)\)/, %Q[$${\1}])'
-e '}' \
$(srcdir)/template/ruby.pc.in > $@
{$(srcdir)/enc}.c.obj:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/)
{$(srcdir)/missing}.c.obj: