User: curvirgo Date: 05/09/11 15:21:39 Modified: /ja/www/documents/develop/ ja_build
Log: remerge "shared libraries copy routine" File Changes: Directory: /ja/www/documents/develop/ ===================================== File [changed]: ja_build Url: http://ja.openoffice.org/source/browse/ja/www/documents/develop/ja_build?r1=1.22&r2=1.23 Delta lines: +23 -1 -------------------- --- ja_build 11 Sep 2005 12:44:29 -0000 1.22 +++ ja_build 11 Sep 2005 22:21:36 -0000 1.23 @@ -326,7 +326,7 @@ fi CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" [ ${BUILD_NUMBER} != 645 ] && { - CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk --enable-kde --with-system-stdlibs --enable-cups --enable-fontconfig --enable-libart --with-system-freetype --enable-openldap --enable-libsn -enable-pam-link --enable-xrender-link --with-system-xrender-headers" + CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk --enable-kde --enable-cups --enable-fontconfig --enable-libart --with-system-freetype --enable-openldap --enable-libsn -enable-pam-link --enable-xrender-link --with-system-xrender-headers" DEFAULT_PACKAGE=portable [ -f /etc/*-release ] && DEFAULT_PACKAGE=rpm [ -f /etc/debian-version ] && DEFAULT_PACKAGE=deb @@ -478,6 +478,28 @@ else CONFIG_FLAGS="${CONFIG_FLAGS} --disable-mozilla" fi + +# ================================================= +# Copy required libralies for Linux +# ================================================= + +[ ${OOO_BUILD_SYSTEM} = LinuxIntel ] && { + PrintMessage "Copying required libralies" + LIBGCC_NAME=libgcc_s.so.1 + if [ ${GCC_VER} -ge 340 ] ; then + LIBCPP_NAME=libstdc++.so.6 # gcc 3.4 + else + LIBCPP_NAME=libstdc++.so.5 # gcc 3.3 + fi + mkdir -p ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/lib + DIR_LIST=`cat /etc/ld.so.conf | grep -e "^/"` + DIR_LIST="${DIR_LIST} /usr/local/lib /lib" + for LDDIR in ${DIR_LIST} + do + [ -f ${LDDIR}/${LIBGCC_NAME} ] && install -v -m644 ${LDDIR}/${LIBGCC_NAME} ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/lib + [ -f ${LDDIR}/${LIBCPP_NAME} ] && install -v -m644 ${LDDIR}/${LIBCPP_NAME} ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/lib + done +} # ================================================= --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
