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

Moved to new slp format

Browse Source
This commit is contained in:
Jay Larson
2020-08-09 08:32:57 -05:00
parent c751c2a715
commit f2e072294b
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -12,24 +12,25 @@ export SRCPKG = curl
export DEPENDS = glibc,gmp,libcurl,libgnutls,libnettle,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/
REPO = main
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 = 6 SLVER = 7
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')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
sed 's/^-//')-$(SNAPVER) sed 's/^-//')-$(SLVER)
LIB := $(PWD)/libcurl LIB := $(PWD)/libcurl
LIBROOT := $(LIB)/ROOT LIBROOT := $(LIB)/ROOT
DEV := $(PWD)/curl-dev DEV := $(PWD)/curl-dev
DEVROOT := $(DEV)/ROOT DEVROOT := $(DEV)/ROOT
include /usr/share/snap/Makefile.snaplinux include /usr/share/sl/Makefile.snaplinux
$(SRCDIR)/configure: $(ARCHIVE) $(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -73,9 +74,9 @@ $(ROOT): $(SRCDIR)/src/curl
@cd $(SRCDIR) && make install DESTDIR=$(ROOT) @cd $(SRCDIR) && make install DESTDIR=$(ROOT)
@install -v -d $(LIB)/SNAP && \ @install -v -d $(LIB)/SL && \
install -v -d $(LIBROOT)/usr/lib && \ install -v -d $(LIBROOT)/usr/lib && \
install -v -d $(DEV)/SNAP && \ install -v -d $(DEV)/SL && \
install -v -d $(DEVROOT) && \ install -v -d $(DEVROOT) && \
for file in `find $(ROOT)|egrep \ for file in `find $(ROOT)|egrep \
'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \ 'man3\/|pkgconfig\/|\.a$$|\.h$$|\.m4$$'`; do \
@@ -85,18 +86,18 @@ $(ROOT): $(SRCDIR)/src/curl
done && \ done && \
mv -v $(ROOT)/usr/lib/libcurl* $(LIBROOT)/usr/lib && \ 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 *.slp ../ && \
cd $(DEV) && make -f ../Makefile.curl-dev && mv *.snap ../ cd $(DEV) && make -f ../Makefile.curl-dev && mv *.slp ../
test: $(ROOT) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \
src/curl --trace-ascii snaptest.txt \ src/curl --trace-ascii sltest.txt \
http://example.com/ > /dev/null && \ http://example.com/ > /dev/null && \
src/curl --trace-ascii snaptest.txt --insecure \ src/curl --trace-ascii sltest.txt --insecure \
https://example.com/ > /dev/null && \ https://example.com/ > /dev/null && \
src/curl --trace-ascii snaptesttime.txt \ src/curl --trace-ascii sltesttime.txt \
--trace-time http://example.com/ > /dev/null && \ --trace-time http://example.com/ > /dev/null && \
src/curl --trace-ascii snaptesttime.txt --insecure \ src/curl --trace-ascii sltesttime.txt --insecure \
--trace-time https://example.com/ > /dev/null && \ --trace-time https://example.com/ > /dev/null && \
echo; \ echo; \
echo "Tests passed"; \ echo "Tests passed"; \
@@ -106,7 +107,7 @@ clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \
$(DEV) \ $(DEV) \
$(LIB) \ $(LIB) \
$(SNAPINFO) \ $(SLINFO) \
$(MANIFEST) \ $(MANIFEST) \
$(FILES) \ $(FILES) \
$(SRCDIR) $(SRCDIR)

3
Makefile.curl-dev
View File

@@ -8,8 +8,9 @@
# 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.
REPO = dev
DEPENDS = libcurl DEPENDS = libcurl
BRIEF = Development files for curl BRIEF = Development files for curl
DESC = Development files for curl DESC = Development files for curl
include /usr/share/snap/Makefile.snaplinux include /usr/share/sl/Makefile.snaplinux

3
Makefile.libcurl
View File

@@ -8,8 +8,9 @@
# 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.
REPO = main
DEPENDS = glibc,gmp,libgnutls,libnettle,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
include /usr/share/snap/Makefile.snaplinux include /usr/share/sl/Makefile.snaplinux

0
SNAP/README → SL/README
View File