From d264d7d6a6beb4ebc9affbe1340779ccef381445 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Sat, 21 Dec 2013 14:55:46 -0800 Subject: finally all green again --- ext/ffi_yajl/ext/parser/Makefile | 49 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'ext/ffi_yajl/ext/parser') diff --git a/ext/ffi_yajl/ext/parser/Makefile b/ext/ffi_yajl/ext/parser/Makefile index 840cc31..de17250 100644 --- a/ext/ffi_yajl/ext/parser/Makefile +++ b/ext/ffi_yajl/ext/parser/Makefile @@ -11,12 +11,12 @@ ECHO = $(ECHO1:0=@echo) #### Start of system configuration section. #### srcdir = . -topdir = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 +topdir = /home/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 hdrdir = $(topdir) -arch_hdrdir = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-darwin12.4.0 +arch_hdrdir = /home/lamont/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/x86_64-linux PATH_SEPARATOR = : VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = /Users/lamont/.rvm/rubies/ruby-2.0.0-p247 +prefix = /home/lamont/.rvm/rubies/ruby-2.0.0-p247 rubysitearchprefix = $(rubylibprefix)/$(sitearch) rubyarchprefix = $(rubylibprefix)/$(arch) rubylibprefix = $(libdir)/$(RUBY_BASE_NAME) @@ -62,12 +62,12 @@ bindir = $(exec_prefix)/bin archdir = $(rubyarchdir) -CC = /usr/bin/clang -CXX = clang++ +CC = gcc +CXX = g++ LIBRUBY = $(LIBRUBY_SO) LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a -LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) -LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static +LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME) +LIBRUBYARG_STATIC = -Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)-static empty = OUTFLAG = -o $(empty) COUTFLAG = -o $(empty) @@ -76,30 +76,30 @@ RUBY_EXTCONF_H = cflags = $(optflags) $(debugflags) $(warnflags) optflags = -O3 -fno-fast-math debugflags = -ggdb3 -warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -CCDLFLAGS = -fno-common -CFLAGS = $(CCDLFLAGS) -I/Users/lamont/git/ffi-yajl/include -L/Users/lamont/git/ffi-yajl/lib -O3 -march=nocona -O2 -pipe -fno-common -Wall $(ARCH_FLAG) +warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration +CCDLFLAGS = -fPIC +CFLAGS = $(CCDLFLAGS) -I/home/lamont/git/ffi-yajl/include -L/home/lamont/git/ffi-yajl/lib $(cflags) -fPIC -O3 -Wall $(ARCH_FLAG) INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) DEFS = -CPPFLAGS = -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include $(DEFS) $(cppflags) +CPPFLAGS = $(DEFS) $(cppflags) CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG) -ldflags = -L/Users/lamont/git/ffi-yajl/lib -I/Users/lamont/git/ffi-yajl/include -L/Users/lamont/git/ffi-yajl/lib -O3 -march=nocona -O2 -pipe -fno-common -lyajl -dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib +ldflags = -L/home/lamont/git/ffi-yajl/lib -I/home/lamont/git/ffi-yajl/include -L/home/lamont/git/ffi-yajl/lib $(cflags) -fPIC -lyajl +dldflags = ARCH_FLAG = DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) -LDSHARED = $(CC) -dynamic -bundle -LDSHAREDXX = $(CXX) -dynamic -bundle +LDSHARED = $(CC) -shared +LDSHAREDXX = $(CXX) -shared AR = ar EXEEXT = RUBY_INSTALL_NAME = ruby -RUBY_SO_NAME = ruby.2.0.0 +RUBY_SO_NAME = ruby RUBYW_INSTALL_NAME = RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version) RUBYW_BASE_NAME = rubyw RUBY_BASE_NAME = ruby -arch = x86_64-darwin12.4.0 +arch = x86_64-linux sitearch = $(arch) ruby_version = 2.0.0 ruby = $(bindir)/ruby @@ -108,8 +108,8 @@ ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/con RM = rm -f RM_RF = $(RUBY) -run -e rm -- -rf -RMDIRS = rmdir -p -MAKEDIRS = mkdir -p +RMDIRS = rmdir --ignore-fail-on-non-empty -p +MAKEDIRS = /bin/mkdir -p INSTALL = /usr/bin/install -c INSTALL_PROG = $(INSTALL) -m 0755 INSTALL_DATA = $(INSTALL) -m 644 @@ -120,8 +120,8 @@ TOUCH = exit > preload = -libpath = . $(libdir) /usr/local/opt/libyaml/lib /usr/local/opt/readline/lib /usr/local/opt/libksba/lib /usr/local/opt/openssl/lib -LIBPATH = -L. -L$(libdir) -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib +libpath = . $(libdir) +LIBPATH = -L. -L$(libdir) -Wl,-R$(libdir) DEFFILE = CLEANFILES = mkmf.log @@ -132,7 +132,7 @@ extout = extout_prefix = target_prefix = /ffi_yajl/ext LOCAL_LIBS = -LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl -lobjc +LIBS = $(LIBRUBYARG_SHARED) -lpthread -lrt -ldl -lcrypt -lm -lc ORIG_SRCS = parser.c SRCS = $(ORIG_SRCS) OBJS = parser.o @@ -140,7 +140,7 @@ HDRS = TARGET = parser TARGET_NAME = parser TARGET_ENTRY = Init_$(TARGET_NAME) -DLLIB = $(TARGET).bundle +DLLIB = $(TARGET).so EXTSTATIC = STATIC_LIB = @@ -152,7 +152,7 @@ HDRDIR = $(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix) ARCHHDRDIR = $(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix) TARGET_SO = $(DLLIB) -CLEANLIBS = $(TARGET).bundle +CLEANLIBS = $(TARGET).so CLEANOBJS = *.o *.bak all: $(DLLIB) @@ -231,7 +231,6 @@ $(DLLIB): $(OBJS) Makefile $(ECHO) linking shared-object ffi_yajl/ext/$(DLLIB) -$(Q)$(RM) $(@) $(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) - $(Q) test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' -f $@ -- cgit v1.2.1