Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 418314 Details for
Bug 567260
dev-util/plan9port-20140306: add prefix support to ebuild
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
plan9port-prefix.patch
plan9port-prefix.patch (text/plain), 1.64 KB, created by
Benda Xu
on 2015-12-02 05:51:16 UTC
(
hide
)
Description:
plan9port-prefix.patch
Filename:
MIME Type:
Creator:
Benda Xu
Created:
2015-12-02 05:51:16 UTC
Size:
1.64 KB
patch
obsolete
>--- plan9port/plan9port-20140306.ebuild >+++ plan9port.new/plan9port-20140306.ebuild >@@ -21,19 +21,33 @@ RDEPEND="${DEPEND}" > S="${WORKDIR}/${PN}" > > PLAN9=/usr/lib/plan9 >+EPLAN9="${EPREFIX}"${PLAN9} > QA_MULTILIB_PATHS="${PLAN9}/.*/.*" > > src_prepare() { > epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch" > >+ # don't hardcode /bin and /usr/bin in PATH >+ sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed" >+ >+ # don't hardcode /usr/{,local/}include and prefix /usr/include/* >+ for f in src/cmd/fontsrv/freetyperules.sh INSTALL \ >+ $(find -name makefile); do >+ sed -r -i -e 's,-I/usr(|/local)/include ,,g' \ >+ -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" ${f} \ >+ || die "sed on ${f} failed" >+ done >+ > # Fix paths, done in place of ./INSTALL -c > einfo "Fixing hard-coded /usr/local/plan9 paths" > grep --null -l -r '/usr/local/plan9' | >- xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g" >+ xargs --null sed -i "s!/usr/local/plan9!${EPLAN9}!g" > } > > src_configure() { >- if ! use X; then >+ if use X; then >+ echo "X11=${EPREFIX}/usr" >> LOCAL.config >+ else > echo "WSYSTYPE=nowsys" >> LOCAL.config > fi > } >@@ -54,14 +68,14 @@ src_install() { > docompress -x $PLAN9/man > > # do* plays with the executable bit, and we should not modify them >- cp -a * "${D}/${PLAN9}" >+ cp -a * "${ED}/${PLAN9}" > > # build the environment variables and install them in env.d > cat > "${T}/30plan9" <<-EOF >- PLAN9="${PLAN9}" >- PATH="${PLAN9}/bin" >- ROOTPATH="${PLAN9}/bin" >- MANPATH="${PLAN9}/man" >+ PLAN9="${EPLAN9}" >+ PATH="${EPLAN9}/bin" >+ ROOTPATH="${EPLAN9}/bin" >+ MANPATH="${EPLAN9}/man" > EOF > doenvd "${T}/30plan9" > }
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 567260
:
418290
| 418314 |
420966
|
420968