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

The following changes were made to Makefile:

Browse Source 
* Changed to new snap version format
  * Moved make and make install from variables to more sensible locations
  * Disabled libcap and gmp in configure
This commit is contained in:
Jay Larson
2017-02-16 18:07:01 -06:00
parent 529c7e85a4
commit 83200d9442
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Makefile
View File

@@ -8,32 +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 = DEPENDS = libacl,libattr,glibc
ARCH = x86_64 ARCH = x86_64
URL = https://www.gnu.org/software/coreutils/coreutils.html 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 \ DESC = The GNU Core Utilities are the basic file, shell and text \
manipulation utilities of the GNU operating system. manipulation utilities of the GNU operating system.
SNAPVER = sr0 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 = 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
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -52,20 +39,22 @@ $(SRCDIR): $(ARCHIVE)
fi fi
$(SRCDIR)/config.log: $(SRCDIR) $(SRCDIR)/config.log: $(SRCDIR)
@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); \
FORCE_UNSAFE_CONFIGURE=1 ./configure \ FORCE_UNSAFE_CONFIGURE=1 ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-libcap \
--without-gmp \
--enable-no-install-program=kill,uptime \
--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
--enable-no-install-program=kill,uptime
$(SRCDIR)/src/uname: $(SRCDIR)/config.log $(SRCDIR)/src/uname: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && FORCE_UNSAFE_CONFIGURE=1 make
$(MAKE)
$(ROOT): $(SRCDIR)/src/uname $(ROOT): $(SRCDIR)/src/uname
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -74,10 +63,19 @@ $(ROOT): $(SRCDIR)/src/uname
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
$(MAKEINST) DESTDIR=$(ROOT) mkdir -p $(ROOT)/bin && mkdir -p $(ROOT)/usr/sbin && \
mv -v $(ROOT)/usr/bin/{cat,chgrp,chmod,chown,cp,date} $(ROOT)/bin && \
@$(SNAPHACKS) 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) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \