Permalink
Browse files

Try to add webapp as use flag. Not sure it works though, no time to t…

…est it.
  • Loading branch information...
1 parent 3c33f69 commit a3caebb93bd0724474dbfdf4d817f9ac78f88e60 @nbigaouette committed Apr 20, 2012
Showing with 23 additions and 7 deletions.
  1. +1 −1 dev-lang/julia/Manifest
  2. +22 −6 dev-lang/julia/julia-9999.ebuild
View
@@ -1 +1 @@
-EBUILD julia-9999.ebuild 3806 RMD160 405cb31e798e1e23fede2138f9d0997da35b0b64 SHA1 14544a239e3bf0a1440b1bcd12523927fa151e6e SHA256 a7270cb83dd1ab1c1a99bd230ab8a06ea54def86a0cf46756d0d81bb854878e9
+EBUILD julia-9999.ebuild 4221 RMD160 1c1a9e27b00a417945de6dadd3a696e6c89cd0d0 SHA1 8924f56253e0a8425dba11dc37105aadbe0316fe SHA256 f66202cf1a5a4a2f984cf9985111d16eb5c2493b0e5f7f406ffa748d702a30ce
@@ -6,17 +6,17 @@ EAPI=4
EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
-inherit git-2 eutils
+inherit git-2 eutils webapp
DESCRIPTION="The Julia Language: a fresh approach to technical computing"
HOMEPAGE="http://julialang.org/"
SRC_URI=""
LICENSE="GPL-2"
-SLOT="0"
+# SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+builtin lighttpd"
+IUSE="builtin webapp"
RDEPEND="
!builtin? (
@@ -30,8 +30,8 @@ RDEPEND="
dev-libs/gmp
sys-libs/libunwind
dev-libs/libpcre
- )
- lighttpd? ( www-servers/lighttpd )"
+ webapp? ( www-servers/lighttpd )
+ )"
DEPEND="
sys-devel/make
dev-vcs/git
@@ -65,7 +65,7 @@ src_prepare() {
}
src_compile() {
- cd external || die "Could not enter 'external' directory!"
+ cd ${S}/external || die "Could not enter 'external' directory!"
# Create libsuitesparse.{so,a} from all sci-libs/suitesparse different libraries
if use builtin; then
@@ -88,11 +88,22 @@ src_compile() {
/usr/$(get_libdir)/libufconfig.so \
${LIBLAPACK} ${LIBBLAS} -lstdc++ -o ${WORKDIR}/${P}/external/root/lib/libsuitesparse.so
+ if use builtin; then
+ if use webapp; then
+ # Download lighttpd
+ cd ${S}/external || die "Could not enter 'external' directory!"
+ elog "Using the included lighttpd has not been tested."
+ make install-lighttpd
+ fi
+ fi
+
cd ${S} || die "Can't cd into ${S}!"
emake
}
src_install() {
+ webapp_src_preinst
+
emake install DESTDIR=${D} PREFIX=/usr
dosym ${D}/usr/share/julia/julia /usr/bin/julia
dosym ${D}/usr/share/julia/julia-release-basic /usr/bin/julia-basic
@@ -103,6 +114,11 @@ src_install() {
#rm -f ${D}/usr/share/julia/lib/libsuitesparse.so # Until sci-libs/suitesparse creates the file, don't delete it.
ln -s /$(get_libdir)/libpcre.so.0 ${D}/usr/share/julia/lib/libpcre.so || die "Can't add symbolic link to pcre"
+
+ if use webapp; then
+ cd ${S}/ui/website
+ cp -R * ${D}/${MY_HTDOCSDIR}
+ fi
}
src_test() {

0 comments on commit a3caebb

Please sign in to comment.