diff options
Diffstat (limited to 'editors/scite/files/patch-makefile')
| -rw-r--r-- | editors/scite/files/patch-makefile | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/editors/scite/files/patch-makefile b/editors/scite/files/patch-makefile new file mode 100644 index 000000000000..6406833ddcae --- /dev/null +++ b/editors/scite/files/patch-makefile @@ -0,0 +1,37 @@ +--- makefile.orig 2013-10-13 23:38:06.000000000 +0200 ++++ makefile 2014-01-27 15:50:05.858185668 +0100 +@@ -5,13 +5,6 @@ + # GNU make does not like \r\n line endings so should be saved to CVS in binary form. + + .SUFFIXES: .cxx .o .h .a .c +-ifdef CLANG +-CC = clang -fsanitize=address --std=c++0x +-CCOMP = clang -fsanitize=address -Wno-empty-body +-else +-CC = g++ +-CCOMP = gcc +-endif + AR = ar + + ifdef GTK3 +@@ -24,7 +17,7 @@ + CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) + CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) + CONFIGTHREADS:= +-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) ++gnomeprefix:=$(PREFIX) + ifndef prefix + ifdef gnomeprefix + prefix=$(gnomeprefix) +@@ -116,8 +109,9 @@ + $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ + FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ + PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \ +- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) +- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ ++ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) ++ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \ ++ -o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) + + # Automatically generate header dependencies with "make deps" + include deps.mak |