Magellan Linux

Diff of /trunk/extras/nss/nss-3.12.4-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3774 by niro, Tue Nov 3 17:33:35 2009 UTC revision 3775 by niro, Tue Nov 3 18:06:58 2009 UTC
# Line 41  src_prepare() Line 41  src_prepare()
41   echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \   echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
42   >> ${SRCDIR}/mozilla/security/coreconf/headers.mk || die   >> ${SRCDIR}/mozilla/security/coreconf/headers.mk || die
43    
  # fix pathes on 64bit systems  
  sed -i 's:$(DIST)/lib:${ROOT}/usr/'"$(mlibdir)"/nspr':' \  
  ${SRCDIR}/mozilla/security/coreconf/location.mk || die  
   
44   # modify install path   # modify install path
45   sed -i 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \   sed -i 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
46   ${SRCDIR}/mozilla/security/coreconf/source.mk || die   ${SRCDIR}/mozilla/security/coreconf/source.mk || die
# Line 52  src_prepare() Line 48  src_prepare()
48    
49  src_compile()  src_compile()
50  {  {
51   cd ${SRCDIR}/mozilla/security/coreconf   cd ${SRCDIR}/mozilla/security
52    
53   [[ ${ARCH} = x86_64 ]] && export USE_64=1   [[ ${ARCH} = x86_64 ]] && export USE_64=1
54    
55   mmake -j1 BUILD_OPT=1 || die   # get the right nspr includes and libs on multilib systems
56   cd ${SRCDIR}/mozilla/security/dbm   export NSPR_INCLUDE_DIR=$(pkg-config --cflags-only-I nspr | sed 's:-I::')
57   mmake -j1 BUILD_OPT=1 || die   export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's:-L::')
58   cd ${SRCDIR}/mozilla/security/nss  
59   mmake -j1 BUILD_OPT=1 || die   mmake -j1 BUILD_OPT=1 -C coreconf || die
60     mmake -j1 BUILD_OPT=1 -C dbm || die
61     mmake -j1 BUILD_OPT=1 -C nss || die
62  }  }
63    
64  src_install()  src_install()

Legend:
Removed from v.3774  
changed lines
  Added in v.3775