aboutsummaryrefslogtreecommitdiff
path: root/editors/scite/files/patch-gtk_makefile
diff options
context:
space:
mode:
Diffstat (limited to 'editors/scite/files/patch-gtk_makefile')
-rw-r--r--editors/scite/files/patch-gtk_makefile34
1 files changed, 34 insertions, 0 deletions
diff --git a/editors/scite/files/patch-gtk_makefile b/editors/scite/files/patch-gtk_makefile
new file mode 100644
index 000000000000..818cf6bae999
--- /dev/null
+++ b/editors/scite/files/patch-gtk_makefile
@@ -0,0 +1,34 @@
+--- gtk/makefile.orig 2018-05-06 22:32:10 UTC
++++ gtk/makefile
+@@ -12,8 +12,8 @@ ifdef CLANG
+ # thread also need to create Position Independent Executable -> search online documentation
+ SANITIZE = address
+ #SANITIZE = undefined
+-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
+-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
++CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
++CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body
+ else
+ MISLEADING=-Wno-misleading-indentation
+ endif
+@@ -28,7 +28,7 @@ endif
+ 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)
+@@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi
+ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
+ MatchMarker.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)
+- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++
++ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
++ $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
++ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
+
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak