all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 34b4ff65330b58fd0e8558aa6223b880305572cc 1106 bytes (raw)
name: gnu/packages/patches/rig.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
--- rig-1.11.orig/Makefile
+++ rig-1.11/Makefile
@@ -1,20 +1,23 @@
-PREFIX=/usr/local
+PREFIX=${out}
 BINDIR=${PREFIX}/bin
 MANDIR=${PREFIX}/man
 DATADIR=${PREFIX}/share/rig
+CXX=g++
 
 all: rig rig.6
 rig: rig.cc
-	g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
+	${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\""
 
 rig.6: rig.6.in
 	sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
 
 install: rig rig.6
-	install -g 0 -m 755 -o 0 -s rig $(BINDIR)
-	install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6
-	install -g 0 -m 755 -o 0 -d $(DATADIR)
-	install -g 0 -m 644 -o 0 data/*.idx $(DATADIR)
+	install -m 755 -d $(DESTDIR)$(BINDIR)
+	install -m 755 -d $(DESTDIR)$(DATADIR)
+	install -m 755 -d $(DESTDIR)$(MANDIR)/man6/
+	install -m 755 rig $(DESTDIR)$(BINDIR)/rig
+	install -m 644 data/*.idx $(DESTDIR)$(DATADIR)
+	install -m 644 rig.6 $(DESTDIR)$(MANDIR)/man6/rig.6
 
 clean:
 	rm -rf *~ *.rej *.orig *.o rig rig.6
--- rig-1.11.orig/rig.cc
+++ rig-1.11/rig.cc
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <errno.h>
 #include <assert.h>
+#include <string.h>
 
 using namespace std;
 

debug log:

solving 34b4ff6533 ...
found 34b4ff6533 in https://yhetil.org/guix/PU1PR01MB2155F7CACB67ADAA58FAF72F8DAE9@PU1PR01MB2155.apcprd01.prod.exchangelabs.com/ ||
	https://yhetil.org/guix/PU1PR01MB2155CA1B3DCC21A4446628E58DB09@PU1PR01MB2155.apcprd01.prod.exchangelabs.com/

applying [1/1] https://yhetil.org/guix/PU1PR01MB2155F7CACB67ADAA58FAF72F8DAE9@PU1PR01MB2155.apcprd01.prod.exchangelabs.com/
diff --git a/gnu/packages/patches/rig.patch b/gnu/packages/patches/rig.patch
new file mode 100644
index 0000000000..34b4ff6533

1:16: trailing whitespace.
 
1:21: trailing whitespace.
 
1:23: space before tab in indent.
 	sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6
1:24: trailing whitespace.
 
1:36: trailing whitespace.
 
Checking patch gnu/packages/patches/rig.patch...
Applied patch gnu/packages/patches/rig.patch cleanly.
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.

skipping https://yhetil.org/guix/PU1PR01MB2155CA1B3DCC21A4446628E58DB09@PU1PR01MB2155.apcprd01.prod.exchangelabs.com/ for 34b4ff6533
index at:
100644 34b4ff65330b58fd0e8558aa6223b880305572cc	gnu/packages/patches/rig.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.