The following changes were made:

* Moved to new version scheme
  * Moved make/make install out of variables
  * Split into separate lib and dev packages
  * Removed usr/share/info/dir
This commit is contained in:
2017-05-30 08:25:58 -05:00
parent 9265754352
commit 3ee24fc726
3 changed files with 63 additions and 15 deletions

View File

@@ -8,24 +8,26 @@
# 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 = export SRCPKG = nettle
ARCH = x86_64 export DEPENDS = glibc,gmp
URL = http://www.lysator.liu.se/~nisse/nettle/ export ARCH = x86_64
export URL = http://www.lysator.liu.se/~nisse/nettle/
BRIEF = Cryptographic library
DESC = Nettle is a cryptographic library that is designed to fit easily in \ DESC = Nettle is a cryptographic library that is designed to fit easily in \
more or less any context more or less any context
SNAPVER = sr0 SNAPVER = 1
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) export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
sed 's/^-//')-$(SNAPVER)
MAKE = make LIB := $(PWD)/libnettle
MAKEINST = make install LIBROOT := $(LIB)/ROOT
SNAPHACKS = install -v -d -m 755 $(ROOT)/usr/share/doc/nettle && \ DEV := $(PWD)/nettle-dev
install -v -m 644 $(SRCDIR)/nettle.html \ DEVROOT := $(DEV)/ROOT
$(ROOT)/usr/share/doc/nettle/nettle.html
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux
@@ -57,8 +59,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(SRCDIR)/libnettle.so: $(SRCDIR)/config.log $(SRCDIR)/libnettle.so: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && make
$(MAKE)
$(ROOT): $(SRCDIR)/libnettle.so $(ROOT): $(SRCDIR)/libnettle.so
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -67,10 +68,25 @@ $(ROOT): $(SRCDIR)/libnettle.so
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT)
$(MAKEINST) DESTDIR=$(ROOT) install -v -d -m 755 $(ROOT)/usr/share/doc/nettle && \
install -v -m 644 $(SRCDIR)/nettle.html \
$(ROOT)/usr/share/doc/nettle/nettle.html && \
rm $(ROOT)/usr/share/info/dir
@$(SNAPHACKS) @install -v -d $(LIB)/SNAP && \
install -v -d $(LIBROOT)/usr/lib && \
install -v -d $(DEV)/SNAP && \
install -v -d $(DEVROOT) && \
mv -v $(ROOT)/usr/lib/lib* $(LIBROOT)/usr/lib && \
for file in `find $(ROOT)|egrep 'man3\/|pkgconfig\/|\.a$$|\.h$$'`; do \
path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
mkdir -vp -m 0755 $$path; \
mv -v $$file $$path; \
done && \
find $(ROOT) -type d -empty -delete && \
cd $(LIB) && make -f ../Makefile.libnettle && mv *.snap ../ && \
cd $(DEV) && make -f ../Makefile.nettle-dev && mv *.snap ../
test: $(ROOT) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \
@@ -78,6 +94,8 @@ test: $(ROOT)
clean: clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \
$(DEV) \
$(LIB) \
$(SNAPINFO) \ $(SNAPINFO) \
$(MANIFEST) \ $(MANIFEST) \
$(FILES) \ $(FILES) \

15
Makefile.libnettle Normal file
View File

@@ -0,0 +1,15 @@
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation here:
# (http://www.gnu.org/licenses/gpl-2.0.html)
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
DEPENDS = glibc,gmp
BRIEF = Runtime library for nettle
DESC = Runtime library for nettle
include /usr/share/snap/Makefile.snaplinux

15
Makefile.nettle-dev Normal file
View File

@@ -0,0 +1,15 @@
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation here:
# (http://www.gnu.org/licenses/gpl-2.0.html)
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
DEPENDS = libnettle
BRIEF = Development files for nettle
DESC = Development files for nettle
include /usr/share/snap/Makefile.snaplinux