Issue 45510 - MacOS X: libxmlsec and libxmlsec1.dylib
Summary: MacOS X: libxmlsec and libxmlsec1.dylib
Status: CLOSED FIXED
Alias: None
Product: porting
Classification: Code
Component: code (show other issues)
Version: current
Hardware: All Mac OS X, all
: P3 Trivial (vote)
Target Milestone: OOo 2.0
Assignee: pavel
QA Contact: issues@porting
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-03-19 21:31 UTC by pavel
Modified: 2005-04-10 20:58 UTC (History)
3 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description pavel 2005-03-19 21:31:24 UTC 
Hi,

the following is needed to get libxmlsec1.dylib and libxmlsec1-nss.dylib copied
to  unxmacxp.pro/lib/ and thus delivered:

--- makefile.mk	12 bře 2005 12:41:51 +0100	1.2
+++ makefile.mk	19 bře 2005 22:25:44 +0100	
@@ -115,7 +115,7 @@
 OUTDIR2INC=include$/xmlsec 
 
 .IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libxmlsec1.*.dylib src$/nss$/.libs$/libxmlsec1-nss.*.dylib 
+OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib 
 .ELIF "$(OS)"=="WNT"
 OUT2LIB+=win32$/binaries$/*.lib
 OUT2BIN+=win32$/binaries$/*.dll

Without this change, module xmlsecurity doesn't build (final link fails).
Comment 1 pavel 2005-03-19 21:59:05 UTC 
and this is needed to get the correct filenames:

Index: file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.91
diff -u -u -r1.91 file_library_ooo.scp
--- file_library_ooo.scp	15 Mar 2005 13:06:33 -0000	1.91
+++ file_library_ooo.scp	19 Mar 2005 21:58:25 -0000
@@ -2099,8 +2091,12 @@
 
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;
-	#ifdef UNX
-        Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+    #ifdef UNX
+        #ifdef MACOSX
+            Name = STRING(CONCAT2(libxmlsec1,UNXSUFFIX));
+        #else
+            Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+        #endif
     #else
         Name = "libxmlsec.dll";
     #endif
@@ -2120,7 +2116,11 @@
 #ifdef UNX
 File gid_File_Lib_LibXMLSec_xmlsecnss
     TXT_FILE_BODY;
-    Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libxmlsec1-nss,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
+    #endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
 End
Comment 2 eric_openoffice 2005-03-20 07:22:56 UTC 
Confirmation from my m87 build that the first patch in module libxmlsec is
necessary. Haven't reached module scp2 yet.
Comment 3 pavel 2005-03-20 11:28:30 UTC 
Change target to 2.0.
Comment 4 pavel 2005-03-22 09:21:05 UTC 
mmi: should I fix this in macosx04 or do you prefer to fix this yourself?
Comment 5 maho.nakata 2005-03-22 14:41:50 UTC 
BTW: after applying your patch, 
we must rebuild whole libxmlsec project by
removing libxmlsec/unxmacxp.pro
Comment 6 mmi 2005-03-23 01:37:15 UTC 
pjanik: the patch seems good to me, so please fix it in the macosx04, thanks.
Comment 7 pavel 2005-03-23 12:08:03 UTC 
Fixed in macosx04.
Comment 8 pavel 2005-03-23 12:08:21 UTC 
Verified.
Comment 9 pavel 2005-04-10 20:58:18 UTC 
Closing.