The following changes were made to Makefile:

* Removed xz and zlib dependencies
  * Added BRIEF
  * Refactored to put the make commands into a more sensible place
  * Added correct patch loop
This commit is contained in:
2017-02-21 11:56:06 -06:00
parent cbb0f3339f
commit edb4a55720

View File

@@ -8,22 +8,19 @@
# 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,kmod,util-linux,xz,zlib DEPENDS = glibc,util-linux
ARCH = x86_64 ARCH = x86_64
URL = http://www.gentoo.org/proj/en/eudev/ URL = http://www.gentoo.org/proj/en/eudev/
BRIEF = Fork of udev
DESC = eudev is a fork of system-udev with the goal of obtaining better \ DESC = eudev is a fork of system-udev with the goal of obtaining better \
compatibility with existing software compatibility with existing software
SNAPVER = sr1 SNAPVER = 2
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)
MAKE = make
MAKEINST = make install
SNAPHACKS =
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -44,9 +41,10 @@ $(SRCDIR): $(ARCHIVE)
$(SRCDIR)/configure: $(SRCDIR) $(SRCDIR)/configure: $(SRCDIR)
$(SRCDIR)/config.log: $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure
@if [ -f $(PATCHDIR)/*.patch ]; then \ @cd $(SRCDIR) && \
cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \ for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
fi patch --verbose -Np1 -i $$patch; \
done
@cd $(SRCDIR); \ @cd $(SRCDIR); \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
@@ -61,13 +59,13 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
--disable-static \ --disable-static \
--enable-manpages \ --enable-manpages \
--enable-rule-generator \ --enable-rule-generator \
--disable-kmod \
--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
$(SRCDIR)/src/udev/udevd: $(SRCDIR)/config.log $(SRCDIR)/src/udev/udevd: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && make
$(MAKE)
$(ROOT): $(SRCDIR)/src/udev/udevd $(ROOT): $(SRCDIR)/src/udev/udevd
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -76,10 +74,7 @@ $(ROOT): $(SRCDIR)/src/udev/udevd
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT)
$(MAKEINST) DESTDIR=$(ROOT)
@$(SNAPHACKS)
test: $(ROOT) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \