To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=58852 Issue #:|58852 Summary:|UNXSUFFIX should be defined by the makefiles Component:|porting Version:|680m141 Platform:|All URL:| OS/Version:|All Status:|NEW Status whiteboard:| Keywords:| Resolution:| Issue type:|TASK Priority:|P3 Subcomponent:|code Assigned to:|mh Reported by:|sparcmoz
------- Additional comments from [EMAIL PROTECTED] Sun Dec 4 05:01:19 -0800 2005 ------- UNXSUFFIX was set up by issue 16860 to help with MACOSX but the definition is hardcoded in scp2 and now there are two flavours of MACOSX. It would be better for all platforms to take the definition from the solenv/inc/unx*mk files. Notice this usage: inc/macros.inc: #define LIBNAME(name) STRING(CONCAT5(lib,name,OFFICEUPD,DLLSUFFIX,UNXSUFFIX)) DLLSUFFIX is passed in on the command line by -DDLLSUFFIX but UNXSUFFIX is hard coded thus: #ifdef UNX #ifdef MACOSX #define UNXSUFFIX .dylib #else #define UNXSUFFIX .so #endif #endif But .dylib and .so are already defined in solenv/inc/unx*mk for example: DLLPOST=.so By copying how DLLSUFFIX is handled it may be possible to do this: (a) remove the #define UNXSUFFIX from scp2 (b) patch solenv/inc/pstrules.mk as follows: --- pstrules.mk 8 Sep 2005 09:38:11 -0000 1.37 +++ pstrules.mk 4 Dec 2005 12:52:44 -0000 @@ -201,7 +201,7 @@ .IF "$(OS)"=="SOLARIS" cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre .ELSE - cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre + cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -DUNXSUFFIX=$(DLLPOST) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre .ENDIF .ENDIF .IF "$(common_build_srs)"!="" But need to check if this has any side effects, and have all platforms set DLLPOST correctly? --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]