Skip to content

Commit

Permalink
Change curl libraries to get app store working.
Browse files Browse the repository at this point in the history
Currently using gnutls, but it seems ownCloud needs openssl. This
fixes #10 so now apps can be discovered and installed, though
owncloud/core#22114 prevents them from
actually working right now.

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
  • Loading branch information
kyrofa committed Feb 4, 2016
1 parent e8e9c98 commit b2f1d57
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
8 changes: 6 additions & 2 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ parts:

# PHP dependencies
- libxml2
- libcurl3-gnutls
- libcurl3
- libpng12-0
- libbz2-1.0
- libmcrypt4
build-packages:
# Apache dependencies
- libapr1-dev
Expand All @@ -40,8 +42,10 @@ parts:

# PHP dependencies
- libxml2-dev
- libcurl4-gnutls-dev
- libcurl4-openssl-dev
- libpng12-dev
- libbz2-dev
- libmcrypt-dev
snap:
- -manual # No need to include the documentation in the .snap

Expand Down
13 changes: 12 additions & 1 deletion src/apache/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,18 @@ install_apache: apache

# Build php
php: extract_php install_apache
@cd php*/ && ./configure --with-apxs2=$(DESTDIR)/bin/apxs --with-pdo-mysql --enable-zip --with-gd --with-zlib --with-curl --disable-rpath --prefix=$(DESTDIR)
@cd php*/ && ./configure --with-apxs2=$(DESTDIR)/bin/apxs --disable-rpath --prefix=$(DESTDIR) \
--enable-ctype \
--enable-mbstring \
--enable-zip \
--with-pdo-mysql \
--with-zlib \
--with-gd \
--with-curl \
--with-openssl \
--with-bz2 \
--with-mcrypt \
--enable-exif
@$(MAKE) -C php*/ -j8
@touch php

Expand Down

0 comments on commit b2f1d57

Please sign in to comment.