diff options
author | Philipp Gesang <phg@phi-gamma.net> | 2019-01-27 21:43:20 +0100 |
---|---|---|
committer | Philipp Gesang <phg@phi-gamma.net> | 2019-01-27 21:51:12 +0100 |
commit | b0c26257f0c1d512d881fe3628a8397de1d15b70 (patch) | |
tree | e77f6d3bd432d7d88db2d021a1dfc53924a09bf7 /pkgs/tools/archivers | |
parent | fa5b8f82c5753fbece52399ca4eab256421f02f1 (diff) |
afio: update 2.5.1 -> 2.5.2
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch | 45 | ||||
-rw-r--r-- | pkgs/tools/archivers/afio/afio-2.5.1-install.patch | 48 | ||||
-rw-r--r-- | pkgs/tools/archivers/afio/default.nix | 6 |
3 files changed, 48 insertions, 51 deletions
diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch new file mode 100644 index 0000000000000..d529952813475 --- /dev/null +++ b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch @@ -0,0 +1,45 @@ +From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 +From: Philipp Gesang <phg@phi-gamma.net> +Date: Sun, 27 Jan 2019 21:37:13 +0100 +Subject: [PATCH] makefile: fix installation + +- comment hard-coded $(CC) +- avoid full paths during install +- set proper permissions +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9268c6f..0797579 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall + + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) + +-CC=gcc ++#CC=gcc + + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment + # variables, if they exist +@@ -94,9 +94,14 @@ clean: + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + ++ifndef DESTDIR ++install: ++ $(error Please specify install prefix as $$DESTDIR) ++else + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -Dm755 afio $(DESTDIR)/bin/afio ++ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 ++endif + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk +-- +2.18.1 + diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch deleted file mode 100644 index 9fa7aacfa887f..0000000000000 --- a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 -+++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 -@@ -66,37 +66,42 @@ - # systems the large file compile environment itself might be buggy or beta. - #LARGEFILEFLAGS= - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - # even more warnings flags.. - MW= - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations - - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} - --CC=gcc -+#CC=gcc - - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio - - clean: - rm -f *.o afio - rm -f regtest/cmpstat regtest/makesparse - rm -f regtest/statsize regtest/statsize64 - cd regtest; /bin/sh regtest.clean - -+ifndef DESTDIR -+install: -+ $(error Please specify install prefix as $$DESTDIR) -+else - install: afio -- cp afio /usr/local/bin -- cp afio.1 /usr/share/man/man1 -+ install -Dm755 afio $(DESTDIR)/bin/afio -+ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 -+endif - - # generate default list of -E extensions from manpage - # note: on sun, I had to change awk command below to nawk or gawk - # to get it to work. - exten_default.h : afio.1 - awk -f exten_make.awk afio.1 >exten_default.h - - - afio.o : afio.h patchlevel.h - compfile.o : afio.h diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 551e38a7869d8..0014febf40e43 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; name = "afio-${version}"; src = fetchurl { url = "http://members.chello.nl/~k.holtman/${name}.tgz"; - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; /* * A patch to simplify the installation and for removing the * hard coded dependency on GCC. */ - patches = [ ./afio-2.5.1-install.patch ]; + patches = [ ./0001-makefile-fix-installation.patch ]; installFlags = "DESTDIR=$(out)"; |