mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-25 02:37:10 -07:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
68 lines
3.5 KiB
Diff
68 lines
3.5 KiB
Diff
--- cppcheck-1.69/gui/gui.pro
|
|
+++ cppcheck-1.69/gui/gui.pro
|
|
@@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
|
|
LIBS += -l../bin/cppcheck-core
|
|
DEFINES += CPPCHECKLIB_IMPORT
|
|
}
|
|
-LIBS += -L$$PWD/../externals
|
|
+LIBS += `pkg-config --libs tinyxml2`
|
|
|
|
DESTDIR = .
|
|
RCC_DIR = temp
|
|
--- cppcheck-1.69/tools/dmake.cpp
|
|
+++ cppcheck-1.69/tools/dmake.cpp
|
|
@@ -171,7 +171,6 @@ int main(int argc, char **argv)
|
|
}
|
|
|
|
std::vector<std::string> externalfiles;
|
|
- getCppFiles(externalfiles, "externals/", true);
|
|
|
|
|
|
// QMAKE - lib/lib.pri
|
|
@@ -180,10 +179,6 @@ int main(int argc, char **argv)
|
|
if (fout1.is_open()) {
|
|
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
|
|
fout1 << "include($$PWD/pcrerules.pri)\n";
|
|
- fout1 << "BASEPATH = ../externals/tinyxml/\n";
|
|
- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
|
|
- fout1 << "BASEPATH = ../lib/\n";
|
|
- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
|
|
fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
|
|
for (unsigned int i = 0; i < libfiles.size(); ++i) {
|
|
std::string fname(libfiles[i].substr(4));
|
|
@@ -209,7 +204,6 @@ int main(int argc, char **argv)
|
|
std::ofstream fout1("test/testfiles.pri");
|
|
if (fout1.is_open()) {
|
|
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
|
|
- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
|
|
fout1 << "\n\nSOURCES += ";
|
|
for (unsigned int i = 0; i < testfiles.size(); ++i) {
|
|
const std::string filename(testfiles[i].substr(5));
|
|
@@ -357,9 +351,9 @@ int main(int argc, char **argv)
|
|
|
|
makeConditionalVariable(fout, "CXX", "g++");
|
|
makeConditionalVariable(fout, "PREFIX", "/usr");
|
|
- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
|
|
- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
|
|
- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
|
|
+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
|
|
+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
|
|
+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
|
|
|
|
fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
|
|
fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
|
|
@@ -399,10 +393,10 @@ int main(int argc, char **argv)
|
|
fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
|
|
fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
|
|
fout << "\t./dmake\n\n";
|
|
- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
|
|
- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
|
|
+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
|
|
+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
|
|
fout << "clean:\n";
|
|
- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
|
|
+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
|
|
fout << "man:\tman/cppcheck.1\n\n";
|
|
fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
|
|
fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
|