diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-29 19:48:33 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-29 19:48:33 +0000 |
| commit | 1918a693d9161b8f13a13fe746f8882c7305ec94 (patch) | |
| tree | 8f70940b79c37089aa4efc5efcaec2a2597a89d3 /x11-toolkits/scintilla/files/patch-aa | |
| parent | - Support CFLAGS properly (diff) | |
Update to 1.55.
PR: 57362
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=89835
Diffstat (limited to '')
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 8d0d5b5e4eb6..6ddc8b3705dd 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,10 +1,7 @@ - -$FreeBSD$ - ---- makefile.orig Sun Aug 10 19:55:54 2003 -+++ makefile Wed Aug 13 00:35:59 2003 -@@ -6,8 +6,8 @@ - # To build for GTK+ 2, define GTK2 on the make command line. +--- makefile.orig Sun Sep 21 11:19:30 2003 ++++ makefile Sun Sep 28 11:48:04 2003 +@@ -8,8 +8,8 @@ + # To force GTK+ 1 build, define GTK1 on the make command line. .SUFFIXES: .cxx .o .h .a -CC = g++ @@ -14,7 +11,7 @@ $FreeBSD$ RANLIB = touch ifeq ($(OSTYPE),darwin) -@@ -16,7 +16,8 @@ +@@ -18,7 +18,8 @@ RANLIB = ranlib endif @@ -24,7 +21,7 @@ $FreeBSD$ vpath %.h ../src ../include vpath %.cxx ../src -@@ -31,9 +32,9 @@ +@@ -33,9 +34,9 @@ endif ifdef DEBUG @@ -35,17 +32,26 @@ $FreeBSD$ +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) endif - ifdef GTK2 -@@ -43,7 +44,7 @@ + # If explicit setting of GTK1 or GTK2 then use that else look for +@@ -44,7 +45,7 @@ + CONFIGFLAGS=pkg-config --cflags gtk+-2.0 + else + ifdef GTK1 +-CONFIGFLAGS=gtk-config --cflags ++CONFIGFLAGS=pkg-config --cflags gtk+ + else + ifneq (,$(findstring /,$(shell whereis -b pkg-config))) + CONFIGFLAGS=pkg-config --cflags gtk+-2.0 +@@ -55,7 +56,7 @@ endif .cxx.o: - $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -+ $(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $< ++ $(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) -@@ -57,7 +58,7 @@ +@@ -69,7 +70,7 @@ # The LEXOBJS have to be treated specially as the functions in them are not called from external code @@ -54,16 +60,16 @@ $FreeBSD$ clean: rm -f *.o $(COMPLIB) -@@ -69,8 +70,10 @@ +@@ -81,8 +82,10 @@ 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 - $(AR) rc $@ $^ - $(RANLIB) $@ -+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^ ++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ + + $(LEXRLIB): $(LEXOBJS) -+ $(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^ ++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ # Automatically generate header dependencies with "make deps" include deps.mak |