Oh my! ... Sorry for being careless. I guess I was so happy to finally fix the problem upstream that I forgot to adapt our recipe accordingly.
Thanks for testing. :) I have made the patch again, and also properly referenced the patch tickets from upstream.
From 85d418a8750cb7b90cab12c5cc7687e8fd8a6981 Mon Sep 17 00:00:00 2001 From: Adonay Felipe Nogueira <adf...@openmailbox.org> Date: Mon, 17 Oct 2016 10:47:21 -0200 Subject: [PATCH] gnu: artanis: Remove implied $(DESTDIR) usage. * gnu/packages/patches/artanis-fix-Makefile.in.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/guile.scm (artanis) ** [source]: Use patch. ** [arguments]: Remove DESTDIR from #:make-flags. --- gnu/local.mk | 2 + gnu/packages/guile.scm | 14 +++-- gnu/packages/patches/artanis-fix-Makefile.in.patch | 70 ++++++++++++++++++++++ 3 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/artanis-fix-Makefile.in.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27872ce..9079b42 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -5,6 +5,7 @@ # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <m...@netris.org> # Copyright © 2016 Chris Marusich <cmmarus...@gmail.com> # Copyright © 2016 Kei Kebreau <k...@openmailbox.org> +# Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org> # # This file is part of GNU Guix. # @@ -454,6 +455,7 @@ dist_patch_DATA = \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arb-ldconfig.patch \ + %D%/packages/patches/artanis-fix-Makefile.in.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7361f1f..a99386a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Erik Edrosa <erik.edr...@gmail.com> ;;; Copyright © 2016 Eraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2016 Alex Kost <alez...@gmail.com> +;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adf...@openmailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -305,7 +306,8 @@ applicable." version ".tar.gz")) (sha256 (base32 - "19m3ak12cqk8js9d2mdg11kh4fjsq8frfpd10qw75h0zpr5cywpp")))) + "19m3ak12cqk8js9d2mdg11kh4fjsq8frfpd10qw75h0zpr5cywpp")) + (patches (search-patches "artanis-fix-Makefile.in.patch")))) (build-system gnu-build-system) ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (inputs `(("guile" ,guile-2.0))) @@ -315,12 +317,14 @@ applicable." (arguments '(#:make-flags ;; TODO: The documentation must be built with the `docs' target. - (let* ((out (assoc-ref %outputs "out")) - (dir (string-append out "/share/guile/site/2.0"))) + (let* + ((dir + (string-append + (assoc-ref %outputs "out") + "/share/guile/site/2.0"))) ;; Don't use (%site-dir) for site paths. (list (string-append "MOD_PATH=" dir) - (string-append "MOD_COMPILED_PATH=" dir) - (string-append "DESTDIR=" out))) + (string-append "MOD_COMPILED_PATH=" dir))) #:test-target "test" #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/artanis-fix-Makefile.in.patch b/gnu/packages/patches/artanis-fix-Makefile.in.patch new file mode 100644 index 0000000..7e4800d --- /dev/null +++ b/gnu/packages/patches/artanis-fix-Makefile.in.patch @@ -0,0 +1,70 @@ +Applies until an Artanis release comes with the following patches +applied: +* <https://savannah.gnu.org/patch/?func=detailitem&item_id=9130> +* <https://savannah.gnu.org/patch/?func=detailitem&item_id=9131> +diff -ru artanis-0.1.2/Makefile.in artanis-0.1.2.1/Makefile.in +--- artanis-0.1.2/Makefile.in 2016-02-10 12:35:18.800490571 -0200 ++++ artanis-0.1.2.1/Makefile.in 2016-10-15 19:44:35.140907367 -0300 +@@ -19,9 +19,18 @@ + MOD_OBJ := $(OBJ)/artanis + BIN := bin + TEMP_LIB_PATH := $(OBJ) +-MOD_PATH := $(shell guile -c "(display (%site-dir))") + MOD_COMPILED_PATH := $(shell guile -c "(display (%site-ccache-dir))") ++ ++ifdef DESTDIR ++INFO_DIR := $(DESTDIR)/share/info/ ++MOD_PATH := $(DESTDIR)/$(shell guile -c "(display (%site-dir))") + MOD_TARGET_PATH := $(DESTDIR)/$(MOD_COMPILED_PATH) ++else ++INFO_DIR := $(PREFIX)/share/info/ ++MOD_PATH := $(shell guile -c "(display (%site-dir))") ++MOD_TARGET_PATH := $(MOD_COMPILED_PATH) ++endif ++ + GUILE_CFLAGS := -Wunsupported-warning -Wunbound-variable -Warity-mismatch -Wduplicate-case-datum -Wbad-case-datum -Wformat + GUILEC := GUILE_LOAD_COMPILED_PATH=$(TEMP_LIB_PATH) guild compile $(GUILE_CFLAGS) + ARTANIS_ETC := $(SRC)/etc/artanis +@@ -36,7 +45,6 @@ + GENDOCS :=$(BUILD_AUX)/gendocs.sh + CHK_TEXINFO := $(BUILD_AUX)/check_texinfo.scm + CP := cp -frd -P +-INFO_DIR := $(PREFIX)/share/info/ + TARBALL_NAME := artanis-$(VERSION) + TMP_DIR := $(shell mktemp -d) + ANN_GEN := $(BUILD_AUX)/announce-gen +@@ -124,18 +132,29 @@ + -rm -f config.{h,log} + + install: $(ALL_TARGETS) +- mkdir -p $(DESTDIR)/$(MOD_PATH) +- $(CP) $(MOD) $(DESTDIR)/$(MOD_PATH)/ ++ mkdir -p $(MOD_PATH) ++ $(CP) $(MOD) $(MOD_PATH)/ + mkdir -p $(MOD_TARGET_PATH)/ + $(CP) $(MOD_OBJ) $(MOD_TARGET_PATH)/ ++ ++ifdef DESTDIR + $(CP) $(ARTANIS_ETC) $(DESTDIR)/etc/ + $(CP) $(ARTANIS_PAGES) $(DESTDIR)/etc/artanis/ +- mkdir -p $(DESTDIR)/$(PREFIX)/bin/ +- $(CP) $(BIN)/art $(DESTDIR)/$(PREFIX)/bin/ ++ mkdir -p $(DESTDIR)/bin/ ++ $(CP) $(BIN)/art $(DESTDIR)/bin/ + mkdir -p $(DESTDIR)/etc/bash_completion.d/ + $(CP) $(CMDCOMP) $(DESTDIR)/etc/bash_completion.d/ ++else ++ $(CP) $(ARTANIS_ETC) $(PREFIX)/etc/ ++ $(CP) $(ARTANIS_PAGES) $(PREFIX)/etc/artanis/ ++ mkdir -p $(PREFIX)/bin/ ++ $(CP) $(BIN)/art $(PREFIX)/bin/ ++ mkdir -p $(PREFIX)/etc/bash_completion.d/ ++ $(CP) $(CMDCOMP) $(PREFIX)/etc/bash_completion.d/ ++endif ++ + if [ -e /etc/bash.bashrc ]; then source /etc/bash.bashrc; fi +- if [ -e artanis.info ]; then mkdir -p $(DESTDIR)/$(INFO_DIR); $(CP) artanis.info $(DESTDIR)/$(INFO_DIR)/; fi ++ if [ -e artanis.info ]; then mkdir -p $(INFO_DIR); $(CP) artanis.info $(INFO_DIR)/; fi + + distclean: distclean-mk clean clean-config clean-tarball + -rm -f $(BIN)/art -- 1.9.1
signature.asc
Description: This is a digitally signed message part
