Changes between Version 1 and Version 2 of CentOS5BuildNotes


Ignore:
Timestamp:
09/05/07 16:09:19 (10 years ago)
Author:
shiva
Comment:

Append patches.

Legend:

Unmodified
Added
Removed
Modified
  • CentOS5BuildNotes

    v1 v2  
    6262make static 
    6363}}} 
     64 
     65== Subversion Externals (svn-externals) == 
     66 
     67The following file supplies a Subversion "externals" property so that a single checkout pulls all required Cyrusoft libraries. 
     68 
     69{{{ 
     70JX      http://svn.mulberrymail.com/mulberry/JX/trunk 
     71Libraries/CICalendar    http://svn.mulberrymail.com/repos/CICalendar/trunk 
     72Libraries/XMLLib        http://svn.mulberrymail.com/repos/XMLLib/trunk 
     73}}} 
     74 
     75== JX Symlink Patch (jxinit-patch.diff) == 
     76 
     77This patch uses the -f flag when creating symlinks in case they already exist. 
     78 
     79{{{ 
     80Index: trunk/Makefile-Linux 
     81=================================================================== 
     82--- trunk/Makefile-Linux        (revision 105) 
     83+++ trunk/Makefile-Linux        (working copy) 
     84@@ -21,18 +21,18 @@ 
     85  
     86 jxinit: 
     87        (cd ${JX_HOME}/include; \ 
     88-        ln -s ../libjcore/code jcore; \ 
     89-        ln -s ../libjx/code jx; \ 
     90-        ln -s ../libjx/image jximage; \ 
     91-        ln -s ../libjx/strings jxstrings) 
     92+        ln -sf ../libjcore/code jcore; \ 
     93+        ln -sf ../libjx/code jx; \ 
     94+        ln -sf ../libjx/image jximage; \ 
     95+        ln -sf ../libjx/strings jxstrings) 
     96        (cd ${JX_HOME}/lib; \ 
     97-        ln -s ../ACE/ACE_wrappers/ace/libACE.a libACE-5_4_7.a; \ 
     98-        ln -s ../ACE/ACE_wrappers/ace/libACE.so libACE-5_4_7.so; \ 
     99-        ln -s ../ACE/ACE_wrappers/ace/libACE.so.5.4.7 libACE.so.5.4.7; \ 
     100-        ln -s ../libjcore/libjcore-2_5_0.a libjcore-2_5_0.a; \ 
     101-        ln -s ../libjcore/libjcore-2_5_0.so libjcore-2_5_0.so; \ 
     102-        ln -s ../libjx/libjx-2_5_0.a libjx-2_5_0.a; \ 
     103-        ln -s ../libjx/libjx-2_5_0.so libjx-2_5_0.so) 
     104+        ln -sf ../ACE/ACE_wrappers/ace/libACE.a libACE-5_4_7.a; \ 
     105+        ln -sf ../ACE/ACE_wrappers/ace/libACE.so libACE-5_4_7.so; \ 
     106+        ln -sf ../ACE/ACE_wrappers/ace/libACE.so.5.4.7 libACE.so.5.4.7; \ 
     107+        ln -sf ../libjcore/libjcore-2_5_0.a libjcore-2_5_0.a; \ 
     108+        ln -sf ../libjcore/libjcore-2_5_0.so libjcore-2_5_0.so; \ 
     109+        ln -sf ../libjx/libjx-2_5_0.a libjx-2_5_0.a; \ 
     110+        ln -sf ../libjx/libjx-2_5_0.so libjx-2_5_0.so) 
     111        touch ${JX_HOME}/ACE/ACE_wrappers/ace/Svc_Conf_l.cpp 
     112  
     113 mulberryinit: 
     114}}} 
     115 
     116== ACE Dynamic Link Patch (Linux-Make.header-patch.diff) == 
     117 
     118This patch moves the ACE library from the statically-linked list to the dynamically-linked list. 
     119 
     120{{{ 
     121Index: Linux/Make.header 
     122=================================================================== 
     123--- Linux/Make.header   (revision 105) 
     124+++ Linux/Make.header   (working copy) 
     125@@ -88,8 +88,8 @@ 
     126                        ${LINK_STATIC} \ 
     127                                -ljx-${JX_LIB_VERSION} \ 
     128                                -ljcore-${JX_LIB_VERSION} \ 
     129+                       ${LINK_DYNAMIC} \ 
     130                                -lACE-${ACE_LIB_VERSION} \ 
     131-                       ${LINK_DYNAMIC} \ 
     132                        ${J_X11_LIBS} \ 
     133                        -lldap -llber \ 
     134                        ${LINK_STATIC} \ 
     135 
     136}}}