unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob ec5e1d46cc4ccc8f863f64d630915c299242e3b7 1789 bytes (raw)
name: gnu/packages/patches/4store-fix-buildsystem.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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
 
This patch sets a fixed version to avoid needing Git and the .git/ folder.
It also removes the creation of "/var/lib/4store", which is not available
during the install phase in GNU Guix.

Patch by Roel Janssen <roel@gnu.org>
*** a/configure.ac	Wed Feb  4 19:05:24 2015
--- b/configure.ac	Wed Mar 23 11:20:38 2016
***************
*** 2,13 ****
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.50])
! AC_INIT([4store], m4_esyscmd([./version.sh .version]), [http://4store.org/support/], [4store])
  AC_CONFIG_SRCDIR([src/backend/backend-intl.h])
! AM_INIT_AUTOMAKE([1.7 std-options -Wall])
  AC_CONFIG_HEADERS(4store-config.h)
  
  # Checks for programs.
  AC_PROG_LIBTOOL
  AC_PROG_AWK
  AC_PROG_CC
--- 2,14 ----
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.50])
! AC_INIT([4store], [1.1.6], [http://4store.org/support/], [4store])
  AC_CONFIG_SRCDIR([src/backend/backend-intl.h])
! AM_INIT_AUTOMAKE([1.7 std-options foreign -Wall])
  AC_CONFIG_HEADERS(4store-config.h)
  
  # Checks for programs.
+ AM_PROG_AR
  AC_PROG_LIBTOOL
  AC_PROG_AWK
  AC_PROG_CC

*** a/src/utilities/Makefile.am	Wed Feb  4 19:05:24 2015
--- b/src/utilities/Makefile.am	Wed Mar 23 14:05:56 2016
***************
*** 13,20 ****
  noinst_PROGRAMS = lex-file-verify 4s-rid
  
  install-data-local: 
! 	mkdir -p $(DESTDIR)@FS_STORE_ROOT@
! 	chmod 1777 $(DESTDIR)@FS_STORE_ROOT@
  
  4s_backend_destroy_SOURCES = backend-destroy.c
  4s_backend_destroy_LDADD = ../common/lib4sintl.a
--- 13,19 ----
  noinst_PROGRAMS = lex-file-verify 4s-rid
  
  install-data-local: 
! 	echo "Please create the following directory: " $(DESTDIR)@FS_STORE_ROOT@
  
  4s_backend_destroy_SOURCES = backend-destroy.c
  4s_backend_destroy_LDADD = ../common/lib4sintl.a

debug log:

solving ec5e1d4 ...
found ec5e1d4 in https://yhetil.org/guix-devel/8760wd5lqt.fsf@gnu.org/

applying [1/1] https://yhetil.org/guix-devel/8760wd5lqt.fsf@gnu.org/
diff --git a/gnu/packages/patches/4store-fix-buildsystem.patch b/gnu/packages/patches/4store-fix-buildsystem.patch
new file mode 100644
index 0000000..ec5e1d4

1:17: trailing whitespace.
  
1:23: trailing whitespace.
  
1:30: trailing whitespace.
  
1:36: trailing whitespace.
  
1:48: trailing whitespace.
  
Checking patch gnu/packages/patches/4store-fix-buildsystem.patch...
Applied patch gnu/packages/patches/4store-fix-buildsystem.patch cleanly.
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.

index at:
100644 ec5e1d46cc4ccc8f863f64d630915c299242e3b7	gnu/packages/patches/4store-fix-buildsystem.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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).