vendor/bundle/gems/ffi-1.9.18/ext/ffi_c/Makefile in tdiary-5.0.5 vs vendor/bundle/gems/ffi-1.9.18/ext/ffi_c/Makefile in tdiary-5.0.6

- old
+ new

@@ -10,16 +10,16 @@ NULLCMD = : #### Start of system configuration section. #### srcdir = . -topdir = /home/sho/.rbenv/versions/2.4.1/include/ruby-2.4.0 +topdir = /home/sho/.rbenv/versions/2.4.2/include/ruby-2.4.0 hdrdir = $(topdir) -arch_hdrdir = /home/sho/.rbenv/versions/2.4.1/include/ruby-2.4.0/x86_64-linux +arch_hdrdir = /home/sho/.rbenv/versions/2.4.2/include/ruby-2.4.0/x86_64-linux PATH_SEPARATOR = : VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = $(DESTDIR)/home/sho/.rbenv/versions/2.4.1 +prefix = $(DESTDIR)/home/sho/.rbenv/versions/2.4.2 rubysitearchprefix = $(rubylibprefix)/$(sitearch) rubyarchprefix = $(rubylibprefix)/$(arch) rubylibprefix = $(libdir)/$(RUBY_BASE_NAME) exec_prefix = $(prefix) vendorarchhdrdir = $(vendorhdrdir)/$(sitearch) @@ -29,12 +29,12 @@ sitehdrdir = $(rubyhdrdir)/site_ruby rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME) vendorarchdir = $(vendorlibdir)/$(sitearch) vendorlibdir = $(vendordir)/$(ruby_version) vendordir = $(rubylibprefix)/vendor_ruby -sitearchdir = $(DESTDIR)./.gem.20170323-3482-c0wisf -sitelibdir = $(DESTDIR)./.gem.20170323-3482-c0wisf +sitearchdir = $(DESTDIR)./.gem.20170929-13155-tkpac8 +sitelibdir = $(DESTDIR)./.gem.20170929-13155-tkpac8 sitedir = $(rubylibprefix)/site_ruby rubyarchdir = $(rubylibdir)/$(arch) rubylibdir = $(rubylibprefix)/$(ruby_version) sitearchincludedir = $(includedir)/$(sitearch) archincludedir = $(includedir)/$(arch) @@ -65,12 +65,12 @@ CC = gcc CXX = g++ LIBRUBY = $(LIBRUBY_A) LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a -LIBRUBYARG_SHARED = -Wl,-R$(libdir) -L$(libdir) -LIBRUBYARG_STATIC = -Wl,-R$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static +LIBRUBYARG_SHARED = -Wl,-rpath,$(libdir) -L$(libdir) +LIBRUBYARG_STATIC = -Wl,-rpath,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static empty = OUTFLAG = -o $(empty) COUTFLAG = -o $(empty) CSRCFLAG = $(empty) @@ -82,14 +82,14 @@ warnflags = CCDLFLAGS = -fPIC CFLAGS = $(CCDLFLAGS) $(cflags) $(ARCH_FLAG) INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) DEFS = -CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -I/home/sho/.rbenv/versions/2.4.1/include $(DEFS) $(cppflags) +CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -I/home/sho/.rbenv/versions/2.4.2/include $(DEFS) $(cppflags) CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG) -ldflags = -L. -L/home/sho/.rbenv/versions/2.4.1/lib -fstack-protector -rdynamic -Wl,-export-dynamic -dldflags = -L/home/sho/.rbenv/versions/2.4.1/lib -Wl,--compress-debug-sections=zlib +ldflags = -L. -L/home/sho/.rbenv/versions/2.4.2/lib -fstack-protector -rdynamic -Wl,-export-dynamic +dldflags = -L/home/sho/.rbenv/versions/2.4.2/lib -Wl,--compress-debug-sections=zlib ARCH_FLAG = DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) LDSHARED = $(CC) -shared LDSHAREDXX = $(CXX) -shared AR = ar @@ -121,11 +121,11 @@ #### End of system configuration section. #### preload = libpath = . $(libdir) -LIBPATH = -L. -L$(libdir) -Wl,-R$(libdir) +LIBPATH = -L. -L$(libdir) -Wl,-rpath,$(libdir) DEFFILE = CLEANFILES = mkmf.log DISTCLEANFILES = DISTCLEANDIRS = @@ -136,11 +136,11 @@ LOCAL_LIBS = LIBS = -lffi -lffi -lpthread -ldl -lcrypt -lm -lc ORIG_SRCS = AbstractMemory.c ArrayType.c Buffer.c Call.c ClosurePool.c DataConverter.c DynamicLibrary.c Function.c FunctionInfo.c LastError.c LongDouble.c MappedType.c MemoryPointer.c MethodHandle.c Platform.c Pointer.c Struct.c StructByReference.c StructByValue.c StructLayout.c Thread.c Type.c Types.c Variadic.c ffi.c SRCS = $(ORIG_SRCS) OBJS = AbstractMemory.o ArrayType.o Buffer.o Call.o ClosurePool.o DataConverter.o DynamicLibrary.o Function.o FunctionInfo.o LastError.o LongDouble.o MappedType.o MemoryPointer.o MethodHandle.o Platform.o Pointer.o Struct.o StructByReference.o StructByValue.o StructLayout.o Thread.o Type.o Types.o Variadic.o ffi.o -HDRS = $(srcdir)/Thread.h $(srcdir)/MappedType.h $(srcdir)/ArrayType.h $(srcdir)/Call.h $(srcdir)/rbffi.h $(srcdir)/AbstractMemory.h $(srcdir)/LastError.h $(srcdir)/Function.h $(srcdir)/StructByReference.h $(srcdir)/MethodHandle.h $(srcdir)/LongDouble.h $(srcdir)/Type.h $(srcdir)/StructByValue.h $(srcdir)/Struct.h $(srcdir)/extconf.h $(srcdir)/ClosurePool.h $(srcdir)/DynamicLibrary.h $(srcdir)/Platform.h $(srcdir)/MemoryPointer.h $(srcdir)/Pointer.h $(srcdir)/compat.h $(srcdir)/rbffi_endian.h $(srcdir)/Types.h +HDRS = $(srcdir)/Struct.h $(srcdir)/Thread.h $(srcdir)/MethodHandle.h $(srcdir)/ArrayType.h $(srcdir)/Function.h $(srcdir)/extconf.h $(srcdir)/Call.h $(srcdir)/rbffi.h $(srcdir)/LongDouble.h $(srcdir)/LastError.h $(srcdir)/StructByValue.h $(srcdir)/Type.h $(srcdir)/MemoryPointer.h $(srcdir)/Types.h $(srcdir)/rbffi_endian.h $(srcdir)/ClosurePool.h $(srcdir)/StructByReference.h $(srcdir)/compat.h $(srcdir)/Platform.h $(srcdir)/MappedType.h $(srcdir)/Pointer.h $(srcdir)/AbstractMemory.h $(srcdir)/DynamicLibrary.h LOCAL_HDRS = TARGET = ffi_c TARGET_NAME = ffi_c TARGET_ENTRY = Init_$(TARGET_NAME) DLLIB = $(TARGET).so @@ -158,10 +158,10 @@ TARGET_SO = $(TARGET_SO_DIR)$(DLLIB) CLEANLIBS = $(TARGET_SO) CLEANOBJS = *.o *.bak all: $(DLLIB) -static: $(STATIC_LIB) install-rb +static: $(STATIC_LIB) .PHONY: all install static install-so install-rb .PHONY: clean clean-so clean-static clean-rb clean-static:: clean-rb-default::