Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 292613 Details for
Bug 385587
www-client/chromium Gentoo Prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
www-client/chromium-17.0.932.0 for Gentoo Prefix patch
chromium-17.0.932.0.prefix.patch (text/plain), 4.84 KB, created by
Asfand Yar Qazi
on 2011-11-15 11:05:33 UTC
(
hide
)
Description:
www-client/chromium-17.0.932.0 for Gentoo Prefix patch
Filename:
MIME Type:
Creator:
Asfand Yar Qazi
Created:
2011-11-15 11:05:33 UTC
Size:
4.84 KB
patch
obsolete
>--- chromium-17.0.932.0.ebuild.orig 2011-11-14 12:00:39.000000000 +0000 >+++ chromium-17.0.932.0.ebuild 2011-11-14 13:05:51.000000000 +0000 >@@ -54,7 +54,6 @@ > x11-libs/libXtst > kerberos? ( virtual/krb5 )" > DEPEND="${RDEPEND} >- dev-lang/nacl-toolchain-newlib > dev-lang/perl > dev-lang/yasm > dev-python/simplejson >@@ -152,13 +151,15 @@ > python_set_active_version 2 > python_pkg_setup > >- if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then >- # Fail if the kernel doesn't support features needed for sandboxing, >- # bug #363907. >- ERROR_PID_NS="PID_NS is required for sandbox to work" >- ERROR_NET_NS="NET_NS is required for sandbox to work" >- CONFIG_CHECK="~PID_NS ~NET_NS" >- check_extra_config >+ if ! use prefix; then >+ if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then >+ # Fail if the kernel doesn't support features needed for sandboxing, >+ # bug #363907. >+ ERROR_PID_NS="PID_NS is required for sandbox to work" >+ ERROR_NET_NS="NET_NS is required for sandbox to work" >+ CONFIG_CHECK="~PID_NS ~NET_NS" >+ check_extra_config >+ fi > fi > > if use bindist; then >@@ -169,8 +170,10 @@ > } > > src_prepare() { >- ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ >- native_client/toolchain/linux_x86_newlib || die >+ if ! use prefix; then >+ ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ >+ native_client/toolchain/linux_x86_newlib || die >+ fi > > # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. > sed -i '1i#define OF(x) x' \ >@@ -237,7 +240,7 @@ > # will be used. > # TODO: find a solution that can be upstreamed. > rmdir v8/include || die >- ln -s /usr/include v8/include || die >+ ln -s ${EPREFIX}/usr/include v8/include || die > > # Make sure the build system will use the right python, bug #344367. > # Only convert directories that need it, to save time. >@@ -282,10 +285,12 @@ > $(gyp_use kerberos use_kerberos) > $(gyp_use pulseaudio use_pulseaudio)" > >- # Enable sandbox. >- myconf+=" >- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox >- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" >+ if ! use prefix; then >+ # Enable sandbox. >+ myconf+=" >+ -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox >+ -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" >+ fi > > # if host-is-pax; then > # # Prevent the build from failing (bug #301880). The performance >@@ -302,6 +307,10 @@ > myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" > fi > >+ if use prefix; then >+ myconf+=" -Ddisable_nacl=1" >+ fi >+ > local myarch="$(tc-arch)" > if [[ $myarch = amd64 ]] ; then > myconf+=" -Dtarget_arch=x64" >@@ -330,7 +339,11 @@ > } > > src_compile() { >- emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die >+ if use prefix; then >+ emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die >+ else >+ emake chrome chromedriver BUILDTYPE=Release V=1 || die >+ fi > pax-mark m out/Release/chrome > if use test; then > emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die >@@ -376,25 +389,29 @@ > src_install() { > exeinto "${CHROMIUM_HOME}" > doexe out/Release/chrome || die >- doexe out/Release/chrome_sandbox || die >- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" >+ if ! use prefix; then >+ doexe out/Release/chrome_sandbox || die >+ fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" >+ fi > > doexe out/Release/chromedriver || die > >- # Install Native Client files on platforms that support it. >- insinto "${CHROMIUM_HOME}" >- case "$(tc-arch)" in >- amd64) >- doexe out/Release/nacl_helper{,_bootstrap} || die >- doins out/Release/nacl_irt_x86_64.nexe || die >- doins out/Release/libppGoogleNaClPluginChrome.so || die >- ;; >- x86) >- doexe out/Release/nacl_helper{,_bootstrap} || die >- doins out/Release/nacl_irt_x86_32.nexe || die >- doins out/Release/libppGoogleNaClPluginChrome.so || die >- ;; >- esac >+ if ! use prefix; then >+ # Install Native Client files on platforms that support it. >+ insinto "${CHROMIUM_HOME}" >+ case "$(tc-arch)" in >+ amd64) >+ doexe out/Release/nacl_helper{,_bootstrap} || die >+ doins out/Release/nacl_irt_x86_64.nexe || die >+ doins out/Release/libppGoogleNaClPluginChrome.so || die >+ ;; >+ x86) >+ doexe out/Release/nacl_helper{,_bootstrap} || die >+ doins out/Release/nacl_irt_x86_32.nexe || die >+ doins out/Release/libppGoogleNaClPluginChrome.so || die >+ ;; >+ esac >+ fi > > newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die > if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 385587
:
288825
|
289463
| 292613