diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-09 09:17:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-09 09:17:42 +0000 |
| commit | 1f9ba344a5e235c6a8667384aa6ec8dd42d73889 (patch) | |
| tree | 170e6ab0a0a9d7dc278b1533c41eec0cba8f9f13 /app-arch/qpress/files | |
| parent | 8b5d973bd4c43f578cef7a46652599e470f1d9fc (diff) | |
gentoo auto-resync : 09:12:2022 - 09:17:42
Diffstat (limited to 'app-arch/qpress/files')
3 files changed, 40 insertions, 14 deletions
diff --git a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch deleted file mode 100644 index b6f7c0f2841b..000000000000 --- a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/makefile -+++ b/makefile -@@ -1,2 +1 @@ --g++: qpress.cpp aio.cpp quicklz.c utilities.cpp -- g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread -\ No newline at end of file -+qpress: aio.o quicklz.o utilities.o diff --git a/app-arch/qpress/files/qpress-1.1-fix-includes.patch b/app-arch/qpress/files/qpress-1.1-fix-includes.patch deleted file mode 100644 index 51bfee465aa9..000000000000 --- a/app-arch/qpress/files/qpress-1.1-fix-includes.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/qpress.cpp -+++ b/qpress.cpp -@@ -1,3 +1,4 @@ -+#include <unistd.h> - /*
- qpress - portable high-speed file archiver
- Copyright Lasse Reinhold 2006-2010
diff --git a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch new file mode 100644 index 000000000000..79676f57664d --- /dev/null +++ b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch @@ -0,0 +1,40 @@ +From 1627b18fdf76e978bdd05b985eb6efb1286fa1da Mon Sep 17 00:00:00 2001 +From: Davide Cavalca <dcavalca@fedoraproject.org> +Date: Thu, 24 Nov 2022 16:13:30 -0800 +Subject: [PATCH] Rework makefile to ease packaging + +--- + makefile | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/makefile b/makefile +index 4890f9d..349fbb2 100755 +--- a/makefile ++++ b/makefile +@@ -1,9 +1,21 @@ +-PREFIX = /usr/local ++DESTDIR ?= ++PREFIX ?= /usr/local ++CXX ?= g++ ++CXXFLAGS ?= -O3 ++CXXFLAGS += -Wall -Wextra -Werror ++LDFLAGS ?= + +-g++: qpress.cpp aio.cpp quicklz.c utilities.cpp +- g++ -O3 -o qpress -x c quicklz.c -x c++ qpress.cpp aio.cpp utilities.cpp -lpthread -Wall -Wextra -Werror ++qpress: qpress.cpp aio.cpp quicklz.c utilities.cpp ++ $(CXX) $(CXXFLAGS) -o qpress -x c quicklz.c -x c++ qpress.cpp aio.cpp utilities.cpp -lpthread $(LDFLAGS) + + install: qpress +- install -m 0755 qpress $(PREFIX)/bin ++ install -D -p -m 0755 -t $(DESTDIR)$(PREFIX)/bin qpress + +-.PHONY: install g++ ++clean: ++ rm -f qpress ++ ++all: qpress ++ ++g++: qpress ++ ++.PHONY: clean install |