snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

chromium: disable nacl on i686 for now.

This commit is contained in:
Juan RP 2012-08-19 12:13:22 +02:00
parent 5badd6ac6f
commit 6b9fa5b797
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
srcpkgs/chromium/template
View File

@ -46,13 +46,18 @@ pre_configure() {
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
# Unpack nacl, its a POSIX tar archive compressed with bzip2. # Unpack nacl, its a POSIX tar archive compressed with bzip2.
tar xf ${wrksrc}/naclsdk_linux -C ${wrksrc} if [ "${XBPS_MACHINE}" != "i686" ]; then
tar xf ${wrksrc}/naclsdk_linux -C ${wrksrc}
ln -s ${wrksrc}/pepper_${_naclsdkver%%.*}/toolchain/linux_x86_newlib \ ln -s ${wrksrc}/pepper_${_naclsdkver%%.*}/toolchain/linux_x86_newlib \
native_client/toolchain/linux_x86_newlib native_client/toolchain/linux_x86_newlib
fi
} }
do_configure() { do_configure() {
if [ "${XBPS_MACHINE}" = "i686" ]; then
_nacl="-Ddisable_nacl=1"
fi
build/gyp_chromium -f make build/all.gyp --depth=. \ build/gyp_chromium -f make build/all.gyp --depth=. \
-Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ -Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \ -Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \
@ -65,7 +70,7 @@ do_configure() {
-Duse_system_xdg_utils=1 -Duse_system_vpx=1 \ -Duse_system_xdg_utils=1 -Duse_system_vpx=1 \
-Duse_system_speex=1 -Duse_system_libwebp=1 \ -Duse_system_speex=1 -Duse_system_libwebp=1 \
-Duse_hunspell=1 -Duse_system_flac=1 \ -Duse_hunspell=1 -Duse_system_flac=1 \
-Duse_gconf=0 -Ddisable_glibc=1 -Duse_gconf=0 -Ddisable_glibc=1 ${_nacl}
} }
do_build() { do_build() {
@ -76,12 +81,12 @@ do_install() {
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname} vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} ${pkgname}-sandbox vinstall out/Release/chrome_sandbox 4755 usr/lib/${pkgname} ${pkgname}-sandbox
cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \ cp out/Release/{*.pak,libffmpegsumo.so} ${DESTDIR}/usr/lib/chromium
out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
${DESTDIR}/usr/lib/chromium
if [ "${XBPS_MACHINE}" = "i686" ]; then if [ "${XBPS_MACHINE}" != "i686" ]; then
rm ${DESTDIR}/usr/lib/chromium/nacl_irt_x86_64.nexe cp out/Release/{nacl_helper{,_bootstrap}} \
out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
${DESTDIR}/usr/lib/chromium
fi fi
cp -a out/Release/locales ${DESTDIR}/usr/lib/chromium cp -a out/Release/locales ${DESTDIR}/usr/lib/chromium