From b94b6be521c3fc689967f9eaca01c5704acde5c5 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sat, 22 Aug 2020 22:23:53 -0500 Subject: [PATCH] Moved to slp format --- Makefile | 18 +++++++++--------- Makefile.libuv-dev | 2 +- {SNAP => SL}/README | 0 3 files changed, 10 insertions(+), 10 deletions(-) rename {SNAP => SL}/README (100%) diff --git a/Makefile b/Makefile index 760b477..463021f 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # server. This might be one of core, main, dev, or # perhaps others. # * BRIEF: Short description, should be 50 chars or less -# * SNAPVER: This is the package version. When a package is +# * SLVER: This is the package version. When a package is # changed, but no changes are made to the source code # this value should be increased. This would include # things like usher being modified, changes to default @@ -34,7 +34,7 @@ # * PATCHDIR: This directory should be ./SRC/patches and is # required, whether or not patches are used. # * VERSION: This should be set automatically based on the -# version string in the source directory and SNAPVER. +# version string in the source directory and SLVER. # The default command here should work in many cases, # but certain packages may need to use a different # method. @@ -65,21 +65,21 @@ export SRCPKG = libuv export DEPENDS = glibc export ARCH = x86_64 export URL = http://libuv.org/ -BUILDDEPS = +BUILDDEPS = automake REPO = main BRIEF = support library with a focus on asynchronous I/O DESC = libuv is a multi-platform support library with a focus on \ asynchronous I/O -SNAPVER = 0 +SLVER = 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') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-v[0-9].*'| \ - sed 's/^-v//')-$(SNAPVER) + sed 's/^-v//')-$(SLVER) -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux DEV := $(PWD)/libuv-dev DEVROOT := $(DEV)/ROOT @@ -134,7 +134,7 @@ $(ROOT): $(SRCDIR)/binfile mv -v $(ROOT)/usr/lib/libuv.so.* $(ROOT)/lib && \ ln -svf ../../lib/$$(readlink $(ROOT)/usr/lib/libuv.so) \ $(ROOT)/usr/lib/libuv.so - install -v -d $(DEV)/SNAP && \ + install -v -d $(DEV)/SL && \ install -v -d $(DEVROOT) && \ for file in `find $(ROOT)| \ egrep 'pkgconfig\/|\.a$$|\.h$$|\.la$$|\.pc$$'`; do \ @@ -143,7 +143,7 @@ $(ROOT): $(SRCDIR)/binfile mv $$file $$path; \ done find $(ROOT) -type d -empty -delete && \ - cd $(DEV) && make -f ../Makefile.libuv-dev && mv *.snap ../ + cd $(DEV) && make -f ../Makefile.libuv-dev && mv *.slp ../ test: $(ROOT) @cd $(SRCDIR) && make check @@ -151,7 +151,7 @@ test: $(ROOT) clean: @rm -rvf $(ROOT) \ $(DEV) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) diff --git a/Makefile.libuv-dev b/Makefile.libuv-dev index 825e2ec..82cccd8 100644 --- a/Makefile.libuv-dev +++ b/Makefile.libuv-dev @@ -13,4 +13,4 @@ REPO = dev BRIEF = Development files for libuv DESC = Development files for libuv -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README