Changeset 14

Show
Ignore:
Timestamp:
06/06/08 15:09:04 (1 year ago)
Author:
tofu.linden
Message:

Simplify/improve the mozilla+llmozlib linux build for a gcc-4.1 world.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/llmozlib2/README-linux-linden.txt

    r8 r14  
    1515========== 
    1616 
    17 Linden Lab should NOT NEED TO CHANGE THIS by default, so they can skip this 
    18 section. 
    19  
    20 We use a specific configuration of x86 libjpeg for Mozilla because, sadly, 
    21 the libjpeg ABI isn't very stable across distributions.  If you want to 
    22 AVOID this custom build of libjpeg and defer to the system libjpeg, 
    23 perform these steps: 
    24  
    25 1. Edit build_mozilla/linux-libxul-bits/mozconfig: 
    26    * remove the 'ac_add_options --with-system-jpeg=...' line 
     17<special instructions no longer applicable> 
    2718 
    28192. GTK AND FRIENDS 
  • trunk/llmozlib2/build-linux-llmozlib.sh

    r8 r14  
    33# mozilla has been built and copy_products_linux.sh has been run. 
    44 
    5 CXX='g++-3.4
     5CXX='g++-4.1
    66MOZARCH='i686-linux' 
    77SRCS='llembeddedbrowser.cpp llembeddedbrowserwindow.cpp llmozlib2.cpp' 
     
    1313INCS_LINE="`find libraries/${MOZARCH}/include -type d | sed s/^/-I/`" 
    1414DEFS='-DMOZILLA_INTERNAL_API -DLL_LINUX=1' 
    15 OPTS='-ggdb
     15OPTS='-ggdb -fvisibility=hidden
    1616 
    1717rm -f ${LIBNAME}.a ${OBJS} 
  • trunk/llmozlib2/build_mozilla/linux-libxul-bits/mozconfig

    r8 r14  
    4444  TARGET_CPU=$MOZ_BUILD_APP 
    4545 
    46   GCC_VERSION=3.4 
     46  GCC_VERSION=4.1 
    4747   
    4848  CC="gcc-$GCC_VERSION" 
     
    111111#ac_add_options --disable-xft 
    112112 
    113 ac_add_options --with-system-jpeg=${CURRENTDIR}/../linux-libxul-bits/lljpeg 
     113#ac_add_options --with-system-jpeg=${CURRENTDIR}/../linux-libxul-bits/lljpeg 
    114114