diff options
Diffstat (limited to 'x11-toolkits/scintilla/files/patch-aa')
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 9daa0643d016..0b7f4d4f9ed0 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,12 +1,13 @@ ---- makefile.orig Wed Dec 24 08:45:12 2003 -+++ makefile Sun Jan 11 19:50:44 2004 -@@ -8,15 +8,16 @@ +--- makefile.orig Fri Jul 9 02:56:56 2004 ++++ makefile Fri Jul 9 03:08:57 2004 +@@ -8,16 +8,17 @@ # To force GTK+ 1 build, define GTK1 on the make command line. - .SUFFIXES: .cxx .o .h .a + .SUFFIXES: .cxx .c .o .h .a -CC = g++ --AR = ar +CC ?= g++ + CCOMP = gcc +-AR = ar +AR = $(CC) -shared RANLIB = touch @@ -20,7 +21,7 @@ vpath %.h ../src ../include vpath %.cxx ../src -@@ -31,29 +32,29 @@ +@@ -32,31 +33,31 @@ endif ifdef DEBUG @@ -36,6 +37,7 @@ ifdef GTK2 -CONFIGFLAGS=pkg-config --cflags gtk+-2.0 +CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 + MARSHALLER=scintilla-marshal.o else ifdef GTK1 -CONFIGFLAGS=gtk-config --cflags @@ -44,6 +46,7 @@ ifneq (,$(findstring /,$(shell whereis pkg-config))) -CONFIGFLAGS=pkg-config --cflags gtk+-2.0 +CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 + MARSHALLER=scintilla-marshal.o else -CONFIGFLAGS=gtk-config --cflags +CONFIGFLAGS=gtk-config --cflags gtk+ gthread @@ -53,12 +56,12 @@ .cxx.o: - $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -+ $(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< ++ $(CC) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< + .c.o: + $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $< - #++Autogenerated -- run src/LexGen.py to regenerate - #**LEXOBJS=\\\n\(\*.o \) -@@ -66,7 +67,7 @@ - LexYAML.o +@@ -72,7 +73,7 @@ + LexVerilog.o LexYAML.o #--Autogenerated -- end of automatically generated section -all: $(COMPLIB) @@ -66,15 +69,15 @@ clean: rm -f *.o $(COMPLIB) -@@ -77,10 +78,11 @@ +@@ -83,10 +84,11 @@ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ - RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ -- $(LEXOBJS) +- $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ - $(RANLIB) $@ -+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o ++ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o $(MARSHALLER) + $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ + +$(LEXRLIB): $(LEXOBJS) |