public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

civetweb: 1.11 -> 1.13

Browse Source
This commit is contained in:
freezeboy 2020-12-27 18:55:22 +01:00 committed by tomberek
parent eba78d4525
commit 20b816cf4f
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
View File

@ -1,18 +1,7 @@
From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001 diff -u a/Makefile b/Makefile
From: Frederik Rietdijk <freddyrietdijk@fridh.nl> --- a/Makefile 2020-12-27 18:48:53.934098765 +0100
Date: Thu, 28 Feb 2019 16:25:49 +0100 +++ b/Makefile 2020-12-27 18:50:44.022674117 +0100
Subject: [PATCH] allow setting paths in makefile @@ -19,13 +19,13 @@
and install headers and libs
---
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index b507e2b0..d21e5c56 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,13 @@ BUILD_DIR = out
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
PREFIX ?= /usr/local PREFIX ?= /usr/local
EXEC_PREFIX = $(PREFIX) EXEC_PREFIX = $(PREFIX)
@ -20,24 +9,16 @@ index b507e2b0..d21e5c56 100644
+BINDIR ?= $(EXEC_PREFIX)/bin +BINDIR ?= $(EXEC_PREFIX)/bin
DATAROOTDIR = $(PREFIX)/share DATAROOTDIR = $(PREFIX)/share
DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
SYSCONFDIR = $(PREFIX)/etc SYSCONFDIR ?= $(PREFIX)/etc
HTMLDIR = $(DOCDIR) HTMLDIR = $(DOCDIR)
-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include -INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib -LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include +INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib +LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
PID_FILE ?= /var/run/$(CPROG).pid
# build tools # build tools
MKDIR = mkdir -p @@ -337,10 +337,10 @@
@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG)
unit_test: $(UNIT_TEST_PROG)
ifeq ($(CAN_INSTALL),1)
-install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
+install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
install -d -m 755 "$(DOCDIR)"
install -m 644 *.md "$(DOCDIR)"
install -d -m 755 "$(BINDIR)"
install -m 755 $(CPROG) "$(BINDIR)/" install -m 755 $(CPROG) "$(BINDIR)/"
install-headers: install-headers:
@ -50,6 +31,3 @@ index b507e2b0..d21e5c56 100644
install-slib: lib$(CPROG).so install-slib: lib$(CPROG).so
$(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
--
2.19.2

11
pkgs/development/libraries/civetweb/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "civetweb"; pname = "civetweb";
version = "1.11"; version = "1.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; sha256 = "/q7Q1lavIR3i126uI4NsKByHJ6Tp+DSN60R4YxR506U=";
}; };
makeFlags = [ makeFlags = [
@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
installTargets = [
"install-headers"
"install-lib"
"install-slib"
"install"
];
preInstall = '' preInstall = ''
mkdir -p $dev/include mkdir -p $dev/include
mkdir -p $out/lib mkdir -p $out/lib