The following changes were made to Makefile:

* moved to new version scheme
  * corrected dependencies
  * corrected typo in description
  * removed dependency on libz
This commit is contained in:
2017-03-30 09:29:45 -05:00
parent 490e7e6765
commit 3492dfcae6

View File

@@ -8,17 +8,18 @@
# 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 = eudev,glibc,ncurses,zlib DEPENDS = eudev,glibc,ncurses,readline
ARCH = x86_64 ARCH = x86_64
URL = https://www.kernel.org/pub/linux/utils/util-linux/ URL = https://www.kernel.org/pub/linux/utils/util-linux/
DESC = util-linux is a random collection of Linux utilitie BRIEF = Linux utilities
SNAPVER = sr1 DESC = util-linux is a random collection of Linux utilities
SNAPVER = 3
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
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -55,6 +56,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
--without-python \ --without-python \
--without-systemd \ --without-systemd \
--without-systemdsystemunitdir \ --without-systemdsystemunitdir \
--without-libz \
--build=x86_64-snap-linux-gnu \ --build=x86_64-snap-linux-gnu \
--host=x86_64-snap-linux-gnu \ --host=x86_64-snap-linux-gnu \
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu