On Sat, Sep 24, 2011 at 08:57:26AM -0400, TJ Frazier wrote: > Hi, Carl, Ariel, > This looks like a recent change by hdu (on CC). He may have some > good words on the subject. --/tj/
I guess he read this list, no need to CC him > >If I got it right, the problem is in solenv/inc/unxlngx.mk > >http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unxlngx.mk?r1=1162288&r2=1174164&diff_format=h > > > >DLLPOSTFIX= > > > >before > > > >DLLPOSTFIX=lx > > > >If the DLLPOSTFIX is changed there, I guess it should be changed also in > >solenv/gbuild/platform/linux.mk. http://svn.apache.org/viewvc?diff_format=h&view=revision&revision=1174164 emptied almost every DLLPOSTFIX in solenv/inc/ There are three DLLPOSTFIXes remaining: * trunk/main/solenv/inc/os2.mk http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/os2.mk?annotate=1174164&diff_format=h&pathrev=1174164#l237 http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/os2.mk?annotate=1174164&diff_format=h&pathrev=1174164#l318 * trunk/main/solenv/inc/wntgcci.mk http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/wntgcci.mk?annotate=1174164&diff_format=h&pathrev=1174164#l185 * gb_Library_OOOEXT should be modified in solenv/gbuild/platform/*.mk to reflect the changes in the gbuild env. A path is attached, I only tested it on Linux x86-64 Regards -- Ariel Constenla-Haile La Plata, Argentina
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 6c6d587..fab6a6d 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -268,10 +268,10 @@ gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) endif ifeq ($(CPUNAME),X86_64) -gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) else -gb_Library_OOOEXT := li$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) endif diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 80044d7..9677acf 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -311,10 +311,10 @@ gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) endif ifeq ($(CPUNAME),INTEL) -gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) else # ifeq ($(CPUNAME),POWERPC) -gb_Library_OOOEXT := mxp$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) endif diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index c4c8f0f..531683b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -243,10 +243,10 @@ gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT) endif ifeq ($(CPUNAME),INTEL) -gb_Library_OOOEXT := si$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) else # ifeq ($(CPUNAME),SPARC) -gb_Library_OOOEXT := ss$(gb_Library_PLAINEXT) +gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) endif diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 510015c..f8abc27 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -491,7 +491,7 @@ gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT) else gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT) endif -gb_Library_OOOEXT := mi$(gb_Library_DLLEXT) +gb_Library_OOOEXT := $(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT) gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT) diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 7cf2162..d77067e 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -515,7 +515,7 @@ gb_Library_STLEXT := port_gcc$(gb_Library_DLLEXT) else gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_DLLEXT) endif -gb_Library_OOOEXT := gi$(gb_Library_DLLEXT) +gb_Library_OOOEXT := $(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT) gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT) diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk index 820d315..c91ca57 100644 --- a/solenv/inc/os2.mk +++ b/solenv/inc/os2.mk @@ -234,7 +234,7 @@ RCLINK=rc RCLINKFLAGS= RCSETVERSION= -DLLPOSTFIX=co +DLLPOSTFIX= .ENDIF @@ -315,7 +315,7 @@ RCLINK=rc RCLINKFLAGS= RCSETVERSION= -DLLPOSTFIX=wo +DLLPOSTFIX= .ENDIF diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 5951538..0d75275 100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -182,7 +182,7 @@ RCLINK= RCLINKFLAGS= RCSETVERSION= -DLLPOSTFIX=gi +DLLPOSTFIX= PCHPOST=.gch ADVAPI32LIB=-ladvapi32
pgpKrFZcgSIE5.pgp
Description: PGP signature
