Unverified Commit 68fa86c0 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

cpufrequtils: perform minimal Makefile substitution & use makeFlags (#482342)

parents 4406a1e0 d74677b6
Loading
Loading
Loading
Loading
+21 −9
Original line number Diff line number Diff line
@@ -15,23 +15,35 @@ stdenv.mkDerivation rec {
    hash = "sha256-AFOgcYPQaUg70GJhS8YcuAgMV32mHN9+ExsGThoa8Yg=";
  };

  patches = [
    # I am not 100% sure that this is ok, but it breaks repeatable builds.
    ./remove-pot-creation-date.patch
  ];

  patchPhase = ''
    sed -e "s@= /usr/bin/@= @g" \
      -e "s@/usr/@$out/@" \
      -i Makefile
  postPatch = ''
    substituteInPlace Makefile \
      --replace-fail /usr/bin/install install
  '';

  makeFlags = [
    "bindir=$(out)/bin"
    "sbindir=$(out)/sbin"
    "mandir=$(man)/man"
    "includedir=$(dev)/include"
    "libdir=$(lib)/lib"
    "localedir=$(out)/share/locale"
    "docdir=$(man)/share/doc/packages/cpufrequtils"
    "confdir=$(out)/etc/"
  ];

  buildInputs = [
    stdenv.cc.libc.linuxHeaders
    libtool
    gettext
  ];

  outputs = [
    "out"
    "lib"
    "dev"
    "man"
  ];

  meta = {
    description = "Tools to display or change the CPU governor settings";
    homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";
+0 −24
Original line number Diff line number Diff line
diff -u cpufrequtils-008/Makefile cpufrequtils-008.new/Makefile
--- cpufrequtils-008/Makefile	2012-05-06 01:17:18.000000000 +0200
+++ cpufrequtils-008.new/Makefile	2013-08-16 20:52:29.961086536 +0200
@@ -205,7 +205,8 @@
 	@xgettext --default-domain=$(PACKAGE) --add-comments \
 		--keyword=_ --keyword=N_ $(UTIL_SRC) && \
 	test -f $(PACKAGE).po && \
-	mv -f $(PACKAGE).po po/$(PACKAGE).pot
+	mv -f $(PACKAGE).po po/$(PACKAGE).pot && \
+        sed -i -e'/POT-Creation/d' po/*.pot
 
 update-gmo: po/$(PACKAGE).pot
 	 @for HLANG in $(LANGUAGES); do \
@@ -217,6 +218,7 @@
 			echo "msgmerge for $$HLANG failed!"; \
 			rm -f po/$$HLANG.new.po; \
 		fi; \
+		sed -i -e'/POT-Creation/d' po/*.po; \
 		msgfmt --statistics -o po/$$HLANG.gmo po/$$HLANG.po; \
 	done;
 
Common subdirectories: cpufrequtils-008/man and cpufrequtils-008.new/man
Common subdirectories: cpufrequtils-008/po and cpufrequtils-008.new/po
Common subdirectories: cpufrequtils-008/utils and cpufrequtils-008.new/utils