Re: [racket-dev] git problem during make
2015-01-11 20:16 GMT+01:00 Matthew Flatt : > I'm not sure what you have in mind with some of the steps, such as step > 4 (using `raco pkg` or `raco link`?). I had forgotten. > The trace suggests that "gui-lib" is linked as a clone at the `raco > pkg` level. Using `raco link -r` to adjust links installed by the > package manager has a difficult-to-predict effect, but it would not > include unlinking the clone at the `raco pkg` level, so that may be the > source of the problem. That's it - it was raco pkg and not raco link I had used. Thanks, Jens Axel > > At Sun, 11 Jan 2015 20:00:45 +0100, Jens Axel Søgaard wrote: >> The following problem occurs while running >> make CPUS=4 >> in the plt repository. >> >> error: 'merge' is not possible because you have unmerged files. >> >> And that's confusing, because git status doesn't report anything. >> >> mba-5:plt soegaard$ git status >> On branch master >> Your branch is up-to-date with 'origin/master'. >> Untracked files: >> (use "git add ..." to include in what will be committed) >> >> The full transcript is below. >> >> Here is what I did to get in this state. >> >> 1. Updated and built the racket repository >> 2. Create a new directory ~/clones/ and cloned github.org/racket/gui >> 3. Added the cloned gui libs to with raco >> 4. Changed things >> 5. Built racket with modified gui in clones. >> 5. Removed the clones with raco link -r >> 6. Updated the repository with git pull >> 7. Tried make. >> >> So there are unmerged files in ~/clones/... but they are no longer linked to. >> >> > ~/racket-from-plt-git/plt/racket/bin/raco link -l | grep clone >> > >> >> /Jens Axel >> >> >> >> mba-5:plt soegaard$ make CPUS=4 >> >> if [ "4" = "" ] ; \ >> >> then make plain-in-place PKGS="main-distribution >> main-distribution-test" ; \ >> >> else make cpus-in-place CPUS="4" PKGS="main-distribution >> main-distribution-test" ; fi >> >> make -j 4 plain-in-place JOB_OPTIONS="-j 4" PKGS="main-distribution >> main-distribution-test" >> >> make base >> >> mkdir -p build/config >> >> echo '#hash((links-search-files . ()))' > build/config/config.rktd >> >> mkdir -p racket/src/build >> >> make racket/src/build/Makefile >> >> make[4]: `racket/src/build/Makefile' is up to date. >> >> cd racket/src/build; make reconfigure >> >> make Makefile >> >> make[5]: `Makefile' is up to date. >> >> cd racket/src/build; make SELF_RACKET_FLAGS="-G `cd ../../../build/config; >> pwd`" >> >> make 3m >> >> cd racket; make 3m >> >> make cgc >> >> make common >> >> make g-c >> >> cd sgc; make ../libmzgc.a >> >> make[10]: `../libmzgc.a' is up to date. >> >> make foreign-stuff >> >> cd ../foreign; make all >> >> make foreign.o >> >> make[11]: `foreign.o' is up to date. >> >> make libffi_ON >> >> make libffi/libffi.la >> >> make[12]: `libffi/libffi.la' is up to date. >> >> make dynlib >> >> cd dynsrc; make dynlib >> >> make ../mzdyn.o >> >> make[10]: `../mzdyn.o' is up to date. >> >> make ../starter >> >> make[10]: `../starter' is up to date. >> >> make mzlibrary >> >> cd src; make all >> >> make mzobjects >> >> make[10]: Nothing to be done for `mzobjects'. >> >> make libracket.a >> >> make[9]: `libracket.a' is up to date. >> >> make racketcgc >> >> make[8]: `racketcgc' is up to date. >> >> cd gc2; make all >> >> make check-sdep >> >> ../racketcgc -G /Users/soegaard/racket-from-plt-git/plt/build/config >> -cqu ../../../racket/gc2/check-sdep.rkt >> >> make xsrc/precomp.h >> >> make[8]: `xsrc/precomp.h' is up to date. >> >> make xobjects >> >> make[8]: Nothing to be done for `xobjects'. >> >> make ../racket3m >> >> make[8]: `../racket3m' is up to date. >> >> cd dynsrc; make dynlib3m >> >> make ../mzdyn3m.o >> >> make[8]: `../mzdyn3m.o' is up to date. >> >> cd gc2; make ../racket3m >> >> make[7]: `../racket3m' is up to date. >> >> make gracket-3m >> >> cd gracket; make 3m >> >> make resources >> >> : >> >> cd gc2; make 3m >> >> make ../gracket3m >> >> make ../GRacket3m.app/Contents/MacOS/GRacket3m >> >> make[10]: `../GRacket3m.app/Contents/MacOS/GRacket3m' is up to date. >> >> cd racket/src/build; make install SELF_RACKET_FLAGS="-G `cd >> ../../../build/config; pwd`" PLT_SETUP_OPTIONS="-j 4 " >> >> make install-3m >> >> make install-3m-common >> >> make install-common-first >> >> mkdir -p "/Users/soegaard/racket-from-plt-git/plt/racket/bin" >> "/Users/soegaard/racket-from-plt-git/plt/racket/collects" >> "/Users/soegaard/racket-from-plt-git/plt/racket/doc" >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib" >> "/Users/soegaard/racket-from-plt-git/plt/racket/include" >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib" >> "/Users/soegaard/racket-from-plt-git/plt/racket/share" >> "/Users/soegaard/racket-from-plt-git/plt/racket/etc" >> "/Users/soegaard/racket-from-plt-git/plt/racket/share/applications" >> "/Users/soegaard/racket-from-plt-git/plt/racket/man" >> >> cd racket; make install-3m >> >> make headers >> >> ./racketcgc -cqu ../../racket/mkincludes.
Re: [racket-dev] git problem during make
I'm not sure what you have in mind with some of the steps, such as step 4 (using `raco pkg` or `raco link`?). The trace suggests that "gui-lib" is linked as a clone at the `raco pkg` level. Using `raco link -r` to adjust links installed by the package manager has a difficult-to-predict effect, but it would not include unlinking the clone at the `raco pkg` level, so that may be the source of the problem. At Sun, 11 Jan 2015 20:00:45 +0100, Jens Axel Søgaard wrote: > The following problem occurs while running > make CPUS=4 > in the plt repository. > > error: 'merge' is not possible because you have unmerged files. > > And that's confusing, because git status doesn't report anything. > > mba-5:plt soegaard$ git status > On branch master > Your branch is up-to-date with 'origin/master'. > Untracked files: > (use "git add ..." to include in what will be committed) > > The full transcript is below. > > Here is what I did to get in this state. > > 1. Updated and built the racket repository > 2. Create a new directory ~/clones/ and cloned github.org/racket/gui > 3. Added the cloned gui libs to with raco > 4. Changed things > 5. Built racket with modified gui in clones. > 5. Removed the clones with raco link -r > 6. Updated the repository with git pull > 7. Tried make. > > So there are unmerged files in ~/clones/... but they are no longer linked to. > > > ~/racket-from-plt-git/plt/racket/bin/raco link -l | grep clone > > > > /Jens Axel > > > > mba-5:plt soegaard$ make CPUS=4 > > if [ "4" = "" ] ; \ > > then make plain-in-place PKGS="main-distribution > main-distribution-test" ; \ > > else make cpus-in-place CPUS="4" PKGS="main-distribution > main-distribution-test" ; fi > > make -j 4 plain-in-place JOB_OPTIONS="-j 4" PKGS="main-distribution > main-distribution-test" > > make base > > mkdir -p build/config > > echo '#hash((links-search-files . ()))' > build/config/config.rktd > > mkdir -p racket/src/build > > make racket/src/build/Makefile > > make[4]: `racket/src/build/Makefile' is up to date. > > cd racket/src/build; make reconfigure > > make Makefile > > make[5]: `Makefile' is up to date. > > cd racket/src/build; make SELF_RACKET_FLAGS="-G `cd ../../../build/config; > pwd`" > > make 3m > > cd racket; make 3m > > make cgc > > make common > > make g-c > > cd sgc; make ../libmzgc.a > > make[10]: `../libmzgc.a' is up to date. > > make foreign-stuff > > cd ../foreign; make all > > make foreign.o > > make[11]: `foreign.o' is up to date. > > make libffi_ON > > make libffi/libffi.la > > make[12]: `libffi/libffi.la' is up to date. > > make dynlib > > cd dynsrc; make dynlib > > make ../mzdyn.o > > make[10]: `../mzdyn.o' is up to date. > > make ../starter > > make[10]: `../starter' is up to date. > > make mzlibrary > > cd src; make all > > make mzobjects > > make[10]: Nothing to be done for `mzobjects'. > > make libracket.a > > make[9]: `libracket.a' is up to date. > > make racketcgc > > make[8]: `racketcgc' is up to date. > > cd gc2; make all > > make check-sdep > > ../racketcgc -G /Users/soegaard/racket-from-plt-git/plt/build/config > -cqu ../../../racket/gc2/check-sdep.rkt > > make xsrc/precomp.h > > make[8]: `xsrc/precomp.h' is up to date. > > make xobjects > > make[8]: Nothing to be done for `xobjects'. > > make ../racket3m > > make[8]: `../racket3m' is up to date. > > cd dynsrc; make dynlib3m > > make ../mzdyn3m.o > > make[8]: `../mzdyn3m.o' is up to date. > > cd gc2; make ../racket3m > > make[7]: `../racket3m' is up to date. > > make gracket-3m > > cd gracket; make 3m > > make resources > > : > > cd gc2; make 3m > > make ../gracket3m > > make ../GRacket3m.app/Contents/MacOS/GRacket3m > > make[10]: `../GRacket3m.app/Contents/MacOS/GRacket3m' is up to date. > > cd racket/src/build; make install SELF_RACKET_FLAGS="-G `cd > ../../../build/config; pwd`" PLT_SETUP_OPTIONS="-j 4 " > > make install-3m > > make install-3m-common > > make install-common-first > > mkdir -p "/Users/soegaard/racket-from-plt-git/plt/racket/bin" > "/Users/soegaard/racket-from-plt-git/plt/racket/collects" > "/Users/soegaard/racket-from-plt-git/plt/racket/doc" > "/Users/soegaard/racket-from-plt-git/plt/racket/lib" > "/Users/soegaard/racket-from-plt-git/plt/racket/include" > "/Users/soegaard/racket-from-plt-git/plt/racket/lib" > "/Users/soegaard/racket-from-plt-git/plt/racket/share" > "/Users/soegaard/racket-from-plt-git/plt/racket/etc" > "/Users/soegaard/racket-from-plt-git/plt/racket/share/applications" > "/Users/soegaard/racket-from-plt-git/plt/racket/man" > > cd racket; make install-3m > > make headers > > ./racketcgc -cqu ../../racket/mkincludes.rkt > "/Users/soegaard/racket-from-plt-git/plt/racket/include" > "../../racket" . > > Making /Users/soegaard/racket-from-plt-git/plt/racket/include > > Done. > > make osx-install > > make unix-install > > cd ..; rm -f "/Users/soegaard/racket-from-plt-git/plt/racke
[racket-dev] git problem during make
The following problem occurs while running make CPUS=4 in the plt repository. error: 'merge' is not possible because you have unmerged files. And that's confusing, because git status doesn't report anything. mba-5:plt soegaard$ git status On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add ..." to include in what will be committed) The full transcript is below. Here is what I did to get in this state. 1. Updated and built the racket repository 2. Create a new directory ~/clones/ and cloned github.org/racket/gui 3. Added the cloned gui libs to with raco 4. Changed things 5. Built racket with modified gui in clones. 5. Removed the clones with raco link -r 6. Updated the repository with git pull 7. Tried make. So there are unmerged files in ~/clones/... but they are no longer linked to. > ~/racket-from-plt-git/plt/racket/bin/raco link -l | grep clone > /Jens Axel mba-5:plt soegaard$ make CPUS=4 if [ "4" = "" ] ; \ then make plain-in-place PKGS="main-distribution main-distribution-test" ; \ else make cpus-in-place CPUS="4" PKGS="main-distribution main-distribution-test" ; fi make -j 4 plain-in-place JOB_OPTIONS="-j 4" PKGS="main-distribution main-distribution-test" make base mkdir -p build/config echo '#hash((links-search-files . ()))' > build/config/config.rktd mkdir -p racket/src/build make racket/src/build/Makefile make[4]: `racket/src/build/Makefile' is up to date. cd racket/src/build; make reconfigure make Makefile make[5]: `Makefile' is up to date. cd racket/src/build; make SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`" make 3m cd racket; make 3m make cgc make common make g-c cd sgc; make ../libmzgc.a make[10]: `../libmzgc.a' is up to date. make foreign-stuff cd ../foreign; make all make foreign.o make[11]: `foreign.o' is up to date. make libffi_ON make libffi/libffi.la make[12]: `libffi/libffi.la' is up to date. make dynlib cd dynsrc; make dynlib make ../mzdyn.o make[10]: `../mzdyn.o' is up to date. make ../starter make[10]: `../starter' is up to date. make mzlibrary cd src; make all make mzobjects make[10]: Nothing to be done for `mzobjects'. make libracket.a make[9]: `libracket.a' is up to date. make racketcgc make[8]: `racketcgc' is up to date. cd gc2; make all make check-sdep ../racketcgc -G /Users/soegaard/racket-from-plt-git/plt/build/config -cqu ../../../racket/gc2/check-sdep.rkt make xsrc/precomp.h make[8]: `xsrc/precomp.h' is up to date. make xobjects make[8]: Nothing to be done for `xobjects'. make ../racket3m make[8]: `../racket3m' is up to date. cd dynsrc; make dynlib3m make ../mzdyn3m.o make[8]: `../mzdyn3m.o' is up to date. cd gc2; make ../racket3m make[7]: `../racket3m' is up to date. make gracket-3m cd gracket; make 3m make resources : cd gc2; make 3m make ../gracket3m make ../GRacket3m.app/Contents/MacOS/GRacket3m make[10]: `../GRacket3m.app/Contents/MacOS/GRacket3m' is up to date. cd racket/src/build; make install SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`" PLT_SETUP_OPTIONS="-j 4 " make install-3m make install-3m-common make install-common-first mkdir -p "/Users/soegaard/racket-from-plt-git/plt/racket/bin" "/Users/soegaard/racket-from-plt-git/plt/racket/collects" "/Users/soegaard/racket-from-plt-git/plt/racket/doc" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/include" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/share" "/Users/soegaard/racket-from-plt-git/plt/racket/etc" "/Users/soegaard/racket-from-plt-git/plt/racket/share/applications" "/Users/soegaard/racket-from-plt-git/plt/racket/man" cd racket; make install-3m make headers ./racketcgc -cqu ../../racket/mkincludes.rkt "/Users/soegaard/racket-from-plt-git/plt/racket/include" "../../racket" . Making /Users/soegaard/racket-from-plt-git/plt/racket/include Done. make osx-install make unix-install cd ..; rm -f "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racketcgc" cd ..; rm -f "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" cd ..; cp racket/starter "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" cp ../../racket/dynsrc/starter-sh . cd ..; cp racket/starter-sh "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter-sh" cd ..; strip "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" ./racketcgc -cu "../../racket/collects-path.rkt" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" ../collects ../etc cd ..; echo 'CC=gcc' > "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'CFLAGS=-g -O2 -Wall -DOS_X -D_DARWIN_UNLIMITED_SELECT -pthread' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'OPTIONS= -fno-common -DUSE_SENORA_GC' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'MZOPTION
