main/curl
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: main:v7.50.3-2
Branches Tags
main:master main:0.0alpha1
main:v7.50.3-7 main:v7.50.3-6 main:v7.50.3-4 main:v7.50.3-3 main:v7.50.3-2
..
compare: main:v7.50.3-6
Branches Tags
main:0.0alpha1 main:master
main:v7.50.3-7 main:v7.50.3-6 main:v7.50.3-4 main:v7.50.3-3 main:v7.50.3-2

4 Commits
v7.50.3-2 ... v7.50.3-6

Author SHA1 Message Date
Jay Larson
c751c2a715 Added static lib to curl-dev 2017-05-30 09:12:38 -05:00
Jay Larson
7e5b2a5ccd More dependency corrections (libgnutls, libnettle) 2017-05-30 08:41:03 -05:00
Jay Larson
9f256b57f8 Corrected dependency (nettle -> libnettle) 2017-05-30 08:36:50 -05:00
Jay Larson
3dfb037f37 Updated Makefile to touch configure so that it can properly depend on ARCHIVE 2017-05-29 14:56:01 -05:00
2 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

10
Makefile
View File

@@ -9,13 +9,13 @@
# GNU General Public License for more details. # GNU General Public License for more details.
export SRCPKG = curl export SRCPKG = curl
export DEPENDS = glibc,gmp,gnutls,libcurl,nettle,openssl,zlib export DEPENDS = glibc,gmp,libcurl,libgnutls,libnettle,openssl,zlib
export ARCH = x86_64 export ARCH = x86_64
export URL = http://curl.haxx.se/ export URL = http://curl.haxx.se/
BRIEF = Tool which transfers data from or to a server BRIEF = Tool which transfers data from or to a server
DESC = curl is a command line tool and library for transferring data \ DESC = curl is a command line tool and library for transferring data \
with URL syntax with URL syntax
SNAPVER = 2 SNAPVER = 6
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -31,7 +31,7 @@ DEVROOT := $(DEV)/ROOT
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
$(SRCDIR)/configure: $(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
tar -jxf $(ARCHIVE); \ tar -jxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ elif [ '$(TYPE)' == 'application/x-gzip' ]; then \
@@ -44,6 +44,7 @@ $(SRCDIR)/configure:
echo 'Unable to determine archive type'; \ echo 'Unable to determine archive type'; \
exit 1; \ exit 1; \
fi fi
@touch $(SRCDIR)/configure
$(SRCDIR)/config.log: $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure
@cd $(SRCDIR) && \ @cd $(SRCDIR) && \
@@ -53,7 +54,6 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
@cd $(SRCDIR); \ @cd $(SRCDIR); \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-static \
--enable-threaded-resolver \ --enable-threaded-resolver \
--without-ssl \ --without-ssl \
--with-gnutls \ --with-gnutls \
@@ -77,13 +77,13 @@ $(ROOT): $(SRCDIR)/src/curl
install -v -d $(LIBROOT)/usr/lib && \ install -v -d $(LIBROOT)/usr/lib && \
install -v -d $(DEV)/SNAP && \ install -v -d $(DEV)/SNAP && \
install -v -d $(DEVROOT) && \ install -v -d $(DEVROOT) && \
mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \
for file in `find $(ROOT)|egrep \ for file in `find $(ROOT)|egrep \
'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \ 'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \
path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
mkdir -vp -m 0755 $$path; \ mkdir -vp -m 0755 $$path; \
mv -v $$file $$path; \ mv -v $$file $$path; \
done && \ done && \
mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \
find $(ROOT) -type d -empty -delete && \ find $(ROOT) -type d -empty -delete && \
cd $(LIB) && make -f ../Makefile.libcurl && mv *.snap ../ && \ cd $(LIB) && make -f ../Makefile.libcurl && mv *.snap ../ && \
cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../ cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../

2
Makefile.libcurl
View File

@@ -8,7 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
DEPENDS = glibc,gmp,gnutls,nettle,zlib DEPENDS = glibc,gmp,libgnutls,libnettle,zlib
BRIEF = Runtime library for curl BRIEF = Runtime library for curl
DESC = Runtime library for curl DESC = Runtime library for curl