diff options
| author | randomdan <randomdan@localhost> | 2011-09-01 11:04:01 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-09-01 11:04:01 +0000 |
| commit | 90b4f7859b040193816b45454fc9140d3621184c (patch) | |
| tree | 8f59b807b9c67dedf098075d0e7553209e468f9e | |
| parent | Now in official tree (diff) | |
| download | portage-90b4f7859b040193816b45454fc9140d3621184c.tar.bz2 portage-90b4f7859b040193816b45454fc9140d3621184c.tar.xz portage-90b4f7859b040193816b45454fc9140d3621184c.zip | |
Disable ASR to work with PCH
Add support for BJAMOPTS
Don't globally determine bjam version
| -rw-r--r-- | www-apps/project2/Manifest | 2 | ||||
| -rw-r--r-- | www-apps/project2/project2-9999.ebuild | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest index 0f5af6a..8332b6c 100644 --- a/www-apps/project2/Manifest +++ b/www-apps/project2/Manifest @@ -1,4 +1,4 @@ EBUILD project2-511.ebuild 1509 RMD160 18fab5d458245d361376e7f681cb95207045a13c SHA1 0b9a4ff3368d94d58e1b2524c71bf2df6d5e2d2f SHA256 32143415b632db5df147567f1ea42188effa61fa39d6c86994d8c4a6f4b7a73d EBUILD project2-524.ebuild 1509 RMD160 18fab5d458245d361376e7f681cb95207045a13c SHA1 0b9a4ff3368d94d58e1b2524c71bf2df6d5e2d2f SHA256 32143415b632db5df147567f1ea42188effa61fa39d6c86994d8c4a6f4b7a73d EBUILD project2-546.ebuild 1516 RMD160 19e9e0b19190d53d435a7b1751c507dba06f44a8 SHA1 a3206e5608e48a71ce14471639942a0e55d1f115 SHA256 d69c18e93b028debf4f33f537cb953c98ee407da5b173f396f8903f25f1969f1 -EBUILD project2-9999.ebuild 1489 RMD160 68b15f9e763a1ce7a4ad3b90de535c96973d8eb7 SHA1 8a8defe826bcdd24614ff4e046f94a9b2cbef214 SHA256 4409d75225b5f80e9db7d98319abe856ba49f5aaee66174b21ecd0d97743a92c +EBUILD project2-9999.ebuild 1621 RMD160 2a922298c20b4b559309cc45d8bd7bddf649528d SHA1 c5e062b4a6c14f651f5b08eef5f768866bb2e03e SHA256 3819ecbde99a5068ff35b18086ca13344e80763c00c0f312ff8a1e830827e48e diff --git a/www-apps/project2/project2-9999.ebuild b/www-apps/project2/project2-9999.ebuild index b60c31e..203f7ac 100644 --- a/www-apps/project2/project2-9999.ebuild +++ b/www-apps/project2/project2-9999.ebuild @@ -30,7 +30,6 @@ DEPEND=" " RDEPEND="${DEPEND}" ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk" -BJAM=`ls -1 /usr/bin/bjam* | tail -1` use !debug && var="variant=release" use !odbc && odbc="odbc=no" use !postgres && pq="pq=no" @@ -39,13 +38,19 @@ use web && bt="$bt p2cgi" && it="$it installp2cgi" use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi" src_compile() { + BJAM=`ls -1 /usr/bin/bjam* | tail -1` cd ${S}/project2 || die - ${BJAM} ${var} ${odbc} ${pq} ${bt} -q cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed" + setarch $(uname -m) -RL \ + ${BJAM} ${BJAMOPTS} ${var} ${odbc} ${pq} ${bt} -q \ + cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Compile failed" } src_install() { + BJAM=`ls -1 /usr/bin/bjam* | tail -1` cd ${S}/project2 || die - ${BJAM} ${var} ${odbc} ${pq} ${it} -q --bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \ + setarch $(uname -m) -RL \ + ${BJAM} ${BJAMOPTS} ${var} ${odbc} ${pq} ${it} -q \ + --bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \ cflags="${CFLAGS}" linkflags="${LDFLAGS}" || die "Installed failed" mkdir -p ${D}/usr/share/doc/${P} if use docs ; then |