8000 digest.so needs ruby/digest.h which is installed by build-ext · github/ruby@b48b841 · GitHub
[go: up one dir, main page]
Skip to content

Commit b48b841

Browse files
nobunobu
committed
digest.so needs ruby/digest.h which is installed by build-ext
1 parent 204740b commit b48b841

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

‎common.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN_OPTS = --disable-gems
4747
# GITPULLOPTIONS = --no-tags
4848

4949
PRISM_SRCDIR = $(srcdir)/prism
50-
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(PRISM_SRCDIR) -I$(UNICODE_HDR_DIR) $(incflags)
50+
INCFLAGS = -I. -I$(arch_hdrdir) -I$(ext_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(PRISM_SRCDIR) -I$(UNICODE_HDR_DIR) $(incflags)
5151

5252
GEM_HOME =
5353
GEM_PATH =
@@ -860,6 +860,9 @@ clean-platform distclean-platform realclean-platform:
860860
-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || $(NULLCMD)
861861

862862
RUBYSPEC_CAPIEXT = spec/ruby/optional/capi/ext
863+
RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT)
864+
RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY) build-ext
865+
863866
clean-spec: PHONY
864867
-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
865868
-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)

‎defs/gmake.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ update-deps:
506506

507507
# order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
508508
# because the same named directory exists in the source tree.
509-
$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY)
509+
$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(RUBYSPEC_CAPIEXT_DEPS)
510510
$(ECHO) building $@
511511
$(Q) $(MAKEDIRS) $(@D)
512-
$(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) -I$(EXTOUT)/include $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG)
512+
$(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG)
513513
ifneq ($(POSTLINK),)
514514
$(Q) $(POSTLINK)
515515
endif
@@ -520,7 +520,6 @@ rubyspec-capiext: $(RUBYSPEC_CAPIEXT_SO)
520520
@ $(NULLCMD)
521521

522522
ifeq ($(ENABLE_SHARED),yes)
523-
ruby: $(if $(LIBRUBY_SO_UPDATE),$(RUBYSPEC_CAPIEXT_SO))
524523
exts: rubyspec-capiext
525524
endif
526525

‎template/Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
7777

7878
EXTOUT = @EXTOUT@
7979
TIMESTAMPDIR = $(EXTOUT)/.timestamp
80-
arch_hdrdir = $(EXTOUT)/include/$(arch)
80+
ext_hdrdir = $(EXTOUT)/include
81+
arch_hdrdir = $(ext_hdrdir)/$(arch)
8182
VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
8283

8384
empty =

‎win32/Makefile.sub

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,8 @@ ENCOBJS = dmyenc.$(OBJEXT)
493493
EXTOBJS = dmyext.$(OBJEXT)
494494
!endif
495495

496-
arch_hdrdir = $(EXTOUT)/include/$(arch)
496+
ext_hdrdir = $(EXTOUT)/include
497+
arch_hdrdir = $(ext_hdrdir)/$(arch)
497498
top_srcdir = $(srcdir)
498499
hdrdir = $(srcdir)/include
499500
VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_srcdir)
@@ -1468,8 +1469,6 @@ loadpath: verconf.h
14681469
sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
14691470
-e '/^^ /!d;s/ *"\\\\0"$$//;s/" *"//g'
14701471

1471-
RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT)
1472-
RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY)
14731472
RUBYSPEC_CAPIEXT_EXTS =
14741473

14751474
!if [echo>rubyspec-capiext.mk RUBYSPEC_CAPIEXT_EXTS = \]

0 commit comments

Comments
 (0)
0