I've just ran into the following problem, trying to update my FG with brisas script on ArchLinux:
- Code: Select all
$> ./download_and_compile -a n -p n -j 3 FGFS
****************************************
**************** FGFS ******************
****************************************
flightgear exists already.
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (45/45), done.
remote: Total 46 (delta 34), reused 0 (delta 0)
Unpacking objects: 100% (46/46), done.
Von git://gitorious.org/fg/flightgear
14c918a..6d6e452 next -> origin/next
* [neues Tag] remove-ATCDCL -> remove-ATCDCL
Bereits auf 'next'
Ihr Branch ist zu 'origin/next' um 7 Commits hinterher, und kann vorgespult werden.
(benutzen Sie "git pull" um Ihren lokalen Branch zu aktualisieren)
Aktualisiere 14c918a..6d6e452
Fast-forward
3rdparty/flite_hts_engine/CMakeLists.txt | 4 +
CMakeLists.txt | 24 +--
src/ATCDCL/ATC.cxx | 413 ---------------------------------------------------
src/ATCDCL/ATC.hxx | 226 ----------------------------
src/ATCDCL/ATCProjection.cxx | 79 ----------
src/ATCDCL/ATCProjection.hxx | 50 -------
src/ATCDCL/ATCVoice.cxx | 297 -------------------------------------
src/ATCDCL/ATCVoice.hxx | 71 ---------
src/ATCDCL/ATCutils.cxx | 271 ----------------------------------
src/ATCDCL/ATCutils.hxx | 100 -------------
src/ATCDCL/ATISmgr.cxx | 147 -------------------
src/ATCDCL/ATISmgr.hxx | 66 ---------
src/ATCDCL/CMakeLists.txt | 11 --
src/ATCDCL/atis.cxx | 1030 --------------------------------------------------------------------------------------------------------------------------------
src/ATCDCL/atis.hxx | 153 -------------------
src/ATCDCL/atis_lexicon.hxx | 123 ----------------
src/ATCDCL/atis_remap.hxx | 20 ---
src/CMakeLists.txt | 1 -
src/FDM/JSBSim/JSBSim.cxx | 8 +-
src/Instrumentation/HUD/HUD_runway.cxx | 2 +-
src/Instrumentation/KLN89/kln89.cxx | 4 +-
src/Instrumentation/commradio.cxx | 4 +
src/Instrumentation/dclgps.cxx | 51 +++++++
src/Instrumentation/dclgps.hxx | 24 +++
utils/CMakeLists.txt | 12 +-
utils/fgadmin/CMakeLists.txt | 48 +++++-
utils/fgadmin/ChangeLog | 1 -
utils/fgadmin/NEWS | 1 -
utils/fgadmin/autogen.sh | 52 -------
utils/fgadmin/configure.ac | 188 ------------------------
utils/fgadmin/src/CMakeLists.txt | 11 +-
utils/fgadmin/src/config.h | 80 ----------
utils/fgadmin/src/config_cmake.h.in | 2 +
utils/fgadmin/src/main.cxx | 12 +-
utils/fgadmin/src/untarka.c | 10 +-
35 files changed, 157 insertions(+), 3439 deletions(-)
delete mode 100644 src/ATCDCL/ATC.cxx
delete mode 100644 src/ATCDCL/ATC.hxx
delete mode 100644 src/ATCDCL/ATCProjection.cxx
delete mode 100644 src/ATCDCL/ATCProjection.hxx
delete mode 100644 src/ATCDCL/ATCVoice.cxx
delete mode 100644 src/ATCDCL/ATCVoice.hxx
delete mode 100644 src/ATCDCL/ATCutils.cxx
delete mode 100644 src/ATCDCL/ATCutils.hxx
delete mode 100644 src/ATCDCL/ATISmgr.cxx
delete mode 100644 src/ATCDCL/ATISmgr.hxx
delete mode 100644 src/ATCDCL/CMakeLists.txt
delete mode 100644 src/ATCDCL/atis.cxx
delete mode 100644 src/ATCDCL/atis.hxx
delete mode 100644 src/ATCDCL/atis_lexicon.hxx
delete mode 100644 src/ATCDCL/atis_remap.hxx
delete mode 100644 utils/fgadmin/ChangeLog
delete mode 100644 utils/fgadmin/NEWS
delete mode 100755 utils/fgadmin/autogen.sh
delete mode 100644 utils/fgadmin/configure.ac
delete mode 100644 utils/fgadmin/src/config.h
create mode 100644 utils/fgadmin/src/config_cmake.h.in
patching file CMakeLists.txt
Hunk #1 FAILED at 203.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
Here it stops and throws me back to the prompt.
Maybe someone knows, what to do about it?
Thanks and Cheers!
chris