diff options
Diffstat (limited to 'lang/julia/files/patch-src_Makefile')
| -rw-r--r-- | lang/julia/files/patch-src_Makefile | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile index 1afb292e5b6c..6f886938a328 100644 --- a/lang/julia/files/patch-src_Makefile +++ b/lang/julia/files/patch-src_Makefile @@ -1,28 +1,20 @@ ---- src/Makefile.orig 2017-03-06 03:32:23 UTC +--- src/Makefile.orig 2017-06-19 17:48:45 UTC +++ src/Makefile -@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS) - ifeq ($(LLVM_VER),3.3) - override CXXFLAGS += $(JCXXFLAGS) -std=c++11 - else --override CXXFLAGS += $(JCXXFLAGS) -+override CXXFLAGS += $(JCXXFLAGS) -stdlib=libc++ -std=c++11 +@@ -263,7 +263,7 @@ else endif - override CPPFLAGS += $(JCPPFLAGS) -@@ -21,6 +21,7 @@ FLAGS := \ - -D_GNU_SOURCE -I$(BUILDDIR) -I$(SRCDIR) \ - -I$(SRCDIR)/flisp -I$(SRCDIR)/support \ - -I$(LIBUV_INC) -I$(build_includedir) -DLIBRARY_EXPORTS \ -+ -I$(LOCALBASE)/include \ - -I$(JULIAHOME)/deps/valgrind - ifneq ($(USEMSVC), 1) - FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \ -@@ -76,7 +77,7 @@ else - ifeq ($(OS),WINNT) - LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT) - else --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version) -+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags --libs) - endif # OS == WINNT - endif # LLVM_USE_CMAKE == 1 - FLAGS += -DLLVM_SHLIB + $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV) +- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG)) ++ @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG)) -lgcc_s + $(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@ + ifneq ($(OS), WINNT) + @ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT) +@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/ + libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS) + + $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV) +- @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME)) ++ @$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME)) -lgcc_s + $(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@ + ifneq ($(OS), WINNT) + @ln -sf libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia.$(JL_MAJOR_SHLIB_EXT) |