diff options
Diffstat (limited to 'dev-util/cccc/files')
| -rw-r--r-- | dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch | 11 | ||||
| -rw-r--r-- | dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch | 47 |
2 files changed, 58 insertions, 0 deletions
diff --git a/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch new file mode 100644 index 00000000000..dcbe7aa26b4 --- /dev/null +++ b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch @@ -0,0 +1,11 @@ +--- cccc/cccc_tbl.cc ++++ cccc/cccc_tbl.cc +@@ -96,7 +96,7 @@ + typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key()); + if(value_iterator!=map_t::end()) + { +- erase(value_iterator); ++ this->erase(value_iterator); + retval=true; + } + return retval; diff --git a/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch new file mode 100644 index 00000000000..d5fed684df0 --- /dev/null +++ b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch @@ -0,0 +1,47 @@ +--- cccc/posixgcc.mak ++++ cccc/posixgcc.mak +@@ -24,9 +24,11 @@ + + PATHSEP=/ + ++PCCTS_INC = /usr/include/pccts/ ++ + CCC=g++ + LD=g++ +-CFLAGS=-c -I../pccts/h $(CFLAGS_DEBUG) -x c++ ++CFLAGS=-c -I$(PCCTS_INC) $(CFLAGS_DEBUG) -x c++ + C_OFLAG=-o + LDFLAGS=$(LDFLAGS_DEBUG) + LD_OFLAG=-o + +--- cccc/rules.mak ++++ cccc/rules.mak +@@ -39,8 +39,8 @@ + + # locations and flags for antlr and dlg (don't change the flags unless you + # understand PCCTS) +-ANTLR = $(PCCTS_BIN)$(PATHSEP)antlr +-DLG = $(PCCTS_BIN)$(PATHSEP)dlg ++ANTLR = antlr ++DLG = dlg + # Flags for ANTLR: + # -CC = generate C++ output + # -k 2 = use at least 2 tokens of lookahead +@@ -164,14 +164,14 @@ + # to cover this is to add explicit rules for the three + # PCCTS support files which give rise to linkable object + # files. +-AParser.$(OBJEXT): $(PCCTS_H)$(PATHSEP)AParser.cpp +- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT) ++AParser.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)AParser.cpp ++ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT) + +-DLexerBase.$(OBJEXT): $(PCCTS_H)$(PATHSEP)DLexerBase.cpp +- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT) ++DLexerBase.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp ++ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT) + +-ATokenBuffer.$(OBJEXT): $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp +- $(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT) ++ATokenBuffer.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp ++ $(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT) |