From 83200d9442844ca4b59f8f8af5bb622f41629cc0 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Thu, 16 Feb 2017 18:07:01 -0600
Subject: [PATCH] The following changes were made to Makefile:

  * Changed to new snap version format
  * Moved make and make install from variables to more sensible locations
  * Disabled libcap and gmp in configure
---
 Makefile | 54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 0860ae7..68f09aa 100644
--- a/Makefile
+++ b/Makefile
@@ -8,32 +8,19 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = libacl,libattr,glibc
 ARCH = x86_64
 URL = https://www.gnu.org/software/coreutils/coreutils.html
+BRIEF = Basic file, shell, and text utilities
 DESC = The GNU Core Utilities are the basic file, shell and text \
 manipulation utilities of the GNU operating system.
-SNAPVER = sr0
+SNAPVER = 2
 
 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
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
-
-MAKE = FORCE_UNSAFE_CONFIGURE=1 make
-MAKEINST = make install
-SNAPHACKS = @mkdir -p $(ROOT)/bin && mkdir -p $(ROOT)/usr/sbin && \
-        mv -v $(ROOT)/usr/bin/{cat,chgrp,chmod,chown,cp,date} $(ROOT)/bin && \
-        mv -v $(ROOT)/usr/bin/{dd,df,echo,false,head,ln,ls} $(ROOT)/bin && \
-        mv -v $(ROOT)/usr/bin/{mkdir,mknod,mv,nice,pwd,rm} $(ROOT)/bin && \
-        mv -v $(ROOT)/usr/bin/{rmdir,sleep,stty,sync,test} $(ROOT)/bin && \
-        mv -v $(ROOT)/usr/bin/{true,uname,[} $(ROOT)/bin && \
-        mv -v $(ROOT)/usr/bin/chroot $(ROOT)/usr/sbin && \
-        mkdir -p $(ROOT)/usr/share/man/man8 && \
-        mv -v $(ROOT)/usr/share/man/man1/chroot.1 \
-        $(ROOT)/usr/share/man/man8/chroot.8 && \
-        sed -i s/\"1\"/\"8\"/1 $(ROOT)/usr/share/man/man8/chroot.8
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -52,20 +39,22 @@ $(SRCDIR): $(ARCHIVE)
 	fi
 
 $(SRCDIR)/config.log: $(SRCDIR)
-	@if [ -f $(PATCHDIR)/*.patch ]; then \
-		cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \
-	fi
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
+	done
 	@cd $(SRCDIR); \
 	FORCE_UNSAFE_CONFIGURE=1 ./configure \
 		--prefix=/usr \
+		--disable-libcap \
+		--without-gmp \
+		--enable-no-install-program=kill,uptime \
 		--build=x86_64-snap-linux-gnu \
 		--host=x86_64-snap-linux-gnu \
-		--target=x86_64-snap-linux-gnu \
-		--enable-no-install-program=kill,uptime
+		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/src/uname: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && FORCE_UNSAFE_CONFIGURE=1 make
 
 $(ROOT): $(SRCDIR)/src/uname
 	@if [ -d $(ROOT) ]; then \
@@ -74,10 +63,19 @@ $(ROOT): $(SRCDIR)/src/uname
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	mkdir -p $(ROOT)/bin && mkdir -p $(ROOT)/usr/sbin && \
+        mv -v $(ROOT)/usr/bin/{cat,chgrp,chmod,chown,cp,date} $(ROOT)/bin && \
+        mv -v $(ROOT)/usr/bin/{dd,df,echo,false,head,ln,ls} $(ROOT)/bin && \
+        mv -v $(ROOT)/usr/bin/{mkdir,mknod,mv,nice,pwd,rm} $(ROOT)/bin && \
+        mv -v $(ROOT)/usr/bin/{rmdir,sleep,stty,sync,test} $(ROOT)/bin && \
+        mv -v $(ROOT)/usr/bin/{true,uname,[} $(ROOT)/bin && \
+        mv -v $(ROOT)/usr/bin/chroot $(ROOT)/usr/sbin && \
+        mkdir -p $(ROOT)/usr/share/man/man8 && \
+        mv -v $(ROOT)/usr/share/man/man1/chroot.1 \
+        $(ROOT)/usr/share/man/man8/chroot.8 && \
+        sed -i s/\"1\"/\"8\"/1 $(ROOT)/usr/share/man/man8/chroot.8 && \
+	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
 	@cd $(SRCDIR); \