Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
FreeBSD sconscript file
01-26-2008, 05:25 PM,
#12
 
The reason for the >>> and === and <<< parts is that when you make local modifications to a file in SVN, and then changes in the same code are checked in to SVN, and you update your working copy, a conflict is generated. You should be able to see this when you svn up, instead of "U SConstruct" (the U is for "updated") you will see "C SConstruct" (the C is for "conflict"). When there is a conflict Subversion puts your code next to the new code so you can decide which to keep. Thus you can manually resolve the conflict (you should do a "svn resolved SConstruct" once you have resolved it), or you can just delete the file and "svn up" again, and Subversion will restore the version from the server.

As for the BinReloc problem, I don't think you need it on FreeBSD. Try running
Code:
scons use_binreloc=0
and see if that clears up the problem for you. Regardless, I don't get this error, this must have something to do with the version of gcc you're using (which version is it?)...or maybe you have some super restrictive default gcc flags?
Reply


Messages In This Thread
FreeBSD sconscript file - by nomoo - 01-06-2008, 04:34 PM
[No subject] - by nomoo - 01-08-2008, 06:22 PM
[No subject] - by thelusiv - 01-21-2008, 06:31 PM
[No subject] - by nomoo - 01-22-2008, 08:58 AM
[No subject] - by thelusiv - 01-22-2008, 12:21 PM
[No subject] - by nomoo - 01-22-2008, 04:24 PM
[No subject] - by thelusiv - 01-22-2008, 04:53 PM
[No subject] - by nomoo - 01-23-2008, 02:45 PM
[No subject] - by thelusiv - 01-23-2008, 05:40 PM
[No subject] - by thelusiv - 01-24-2008, 12:38 PM
[No subject] - by nomoo - 01-24-2008, 01:10 PM
[No subject] - by thelusiv - 01-26-2008, 05:25 PM
[No subject] - by nomoo - 02-03-2008, 06:17 PM
[No subject] - by thelusiv - 02-03-2008, 06:20 PM
[No subject] - by nomoo - 02-09-2008, 06:55 AM
[No subject] - by joevenzon_phpbb2_import3 - 02-09-2008, 04:01 PM
[No subject] - by nomoo - 02-11-2008, 03:35 PM
[No subject] - by nomoo - 02-11-2008, 03:50 PM
[No subject] - by thelusiv - 02-13-2008, 05:44 PM
[No subject] - by nomoo - 02-28-2008, 05:54 PM
[No subject] - by thelusiv - 02-28-2008, 06:57 PM

Forum Jump:


Users browsing this thread: 1 Guest(s)