|
Apache OpenOffice (AOO) Bugzilla – Full Text Issue Listing |
| Summary: | Build with 4NT fails due to conflicting SOURCEVERSION=FIX645 in minor.mk | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Build Tools | Reporter: | quetschke | ||||||||
| Component: | solenv | Assignee: | hjs <hans-joachim.lankenau> | ||||||||
| Status: | CLOSED FIXED | QA Contact: | issues@tools <issues> | ||||||||
| Severity: | Trivial | ||||||||||
| Priority: | P1 (highest) | CC: | hans-joachim.lankenau, issues, jens-heiner.rechtien | ||||||||
| Version: | OOo 1.1 | ||||||||||
| Target Milestone: | OOo 1.1.1 | ||||||||||
| Hardware: | All | ||||||||||
| OS: | All | ||||||||||
| Issue Type: | DEFECT | Latest Confirmation in: | --- | ||||||||
| Developer Difficulty: | --- | ||||||||||
| Issue Depends on: | |||||||||||
| Issue Blocks: | 23529 | ||||||||||
| Attachments: |
|
||||||||||
Set target 1.1.1 this seem to me rather an issue of "config_office" which assumes a "WORK_STAMP" prefix of "SRX" which is wrong in this case. "solenv/inc/minor.mk" is allways right ;-) this check was meant to detect environment<->sourcetree missmatch. > this seem to me rather an issue of "config_office" which assumes a "WORK_STAMP" > prefix of "SRX" which is wrong in this case. Yup, will think about some magic in set_soenv to parse the minor.mk file. > this check was meant to detect environment<->sourcetree missmatch. Well, it does this only when settings.mk is generating ${UPD}minor.mk and not always. This is a solenv bug ;-) and after I fixed set_soenv this should be fixed. hmm, you're right! if the "*minor.mk" file in "solver" would contain the full "WORK_STAMP" the check would be more complete: wrong "WORK_STAMP" -> "*minor.mk" in solver not found -> rule used -> error... Created attachment 11845 [details]
Patch for config_office/
OK, this is the patch to make it build with 4NT. Please approve and tell
me where to commit.
To avoid code duplication I would propose to remove the:
--- bootstrap.2 ---
# create a minor.mk file
if ( !( -e $SOLARVER/$UPD/$INPATH/inc/${UPD}minor.mk ) ) then
mkdir -p $SOLARVER
mkdir -p $SOLARVER/$UPD
mkdir -p $SOLARVER/$UPD/$INPATH
mkdir -p $SOLARVER/$UPD/$INPATH/inc
cd $SOLARVER/$UPD/$INPATH/inc
cat $SOLARENV/inc/minor.mk > ${UPD}minor.mk
cd ${SRC_ROOT}
endif
--- bootstrap.2 ---
part. settings.mk takes care about that part.
Created attachment 11847 [details]
Oops, use this patch instead
Created attachment 11848 [details]
Not my day today, this should really work
Comitted to ooo111fix1. Heiner, you have to regenerate configure when you're changing configure.in ;-) Volker Ups. What was I thinking. Committed configure, too verified close |
This is for branch cws_srx645_ooo111fix1 The build with 4NT fails due to conflicting SOURCEVERSION=FIX645 in minor.mk. This is no issue for all non 4NT using systems because they generate $SOLARVER/$UPD/$INPATH/inc/${UPD}minor.mk in ./bootstrap but for 4NT settings.mk tries this and fails because of $(SOURCEVERSION) != $(WORK_STAMP) CC'ing ause I set this to P1 because it breaks the build for all 4NT users.