From 094c374941e68bf667719da15c655f148840ebab Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Wed, 4 Nov 2015 08:26:11 +0000 Subject: bzip2: fix cross build on mingw by using autoconf patch --- pkgs/tools/compression/bzip2/default.nix | 64 ++++++++++---------------------- 1 file changed, 20 insertions(+), 44 deletions(-) (limited to 'pkgs/tools/compression') diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a485bf5eab68..286ad16cc861 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,11 +1,7 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, pkgconfig, gnum4 }: let version = "1.0.6"; - - sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic) - && stdenv.system != "i686-cygwin" && !linkStatic; - in stdenv.mkDerivation { name = "bzip2-${version}"; @@ -14,49 +10,29 @@ in stdenv.mkDerivation { sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; }; - crossAttrs = { - patchPhase = '' - sed -i -e '//s|\\|/|' bzip2.c - sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ - -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ - -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ - -e 's/bzip2recover test/bzip2recover/' \ - Makefile* - ''; - }; - - preBuild = stdenv.lib.optionalString sharedLibrary '' - make -f Makefile-libbz2_so - ''; + patches = [ + # original upstream for the autoconf patch is here: + # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch + # but we get the mingw-builds version of the patch, which fixes + # a few more issues + (fetchurl { + url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; + sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; + }) + ]; - preInstall = stdenv.lib.optionalString sharedLibrary '' - mkdir -p $out/lib - mv libbz2.so* $out/lib - ( cd $out/lib && - ln -s libbz2.so.1.0.? libbz2.so && - ln -s libbz2.so.1.0.? libbz2.so.1 - ) - ''; + patchFlags = "-p0"; - installFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ libtool autoconf automake gnum4 pkgconfig ]; - postInstall = '' - rm $out/bin/bunzip2* $out/bin/bzcat* - ln -s bzip2 $out/bin/bunzip2 - ln -s bzip2 $out/bin/bzcat - ''; + preConfigure = "sh ./autogen.sh"; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' - ''; - - preConfigure = '' - substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man' - ''; - - makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static"; - - inherit linkStatic; + crossAttrs = { + # https://github.com/niXman/mingw-builds/blob/master/patches/bzip2/bzip2-1.0.5-slash.patch + postPatch = '' + sed -i -e '//s|\\|/|' bzip2.c + ''; + }; meta = { homepage = "http://www.bzip.org"; -- cgit 1.4.1 From 5f25c63bfd599228748726b2ba7d43754f5a0b3b Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 23 Nov 2015 11:23:37 +0000 Subject: Revert "bzip2: fix cross build on mingw by using autoconf patch" This reverts commit 094c374941e68bf667719da15c655f148840ebab. --- pkgs/tools/compression/bzip2/default.nix | 64 ++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 20 deletions(-) (limited to 'pkgs/tools/compression') diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 286ad16cc861..a485bf5eab68 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchurl, libtool, autoconf, automake, pkgconfig, gnum4 }: +{ stdenv, fetchurl, linkStatic ? false }: let version = "1.0.6"; + + sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic) + && stdenv.system != "i686-cygwin" && !linkStatic; + in stdenv.mkDerivation { name = "bzip2-${version}"; @@ -10,30 +14,50 @@ in stdenv.mkDerivation { sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; }; - patches = [ - # original upstream for the autoconf patch is here: - # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch - # but we get the mingw-builds version of the patch, which fixes - # a few more issues - (fetchurl { - url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; - sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; - }) - ]; - - patchFlags = "-p0"; - - nativeBuildInputs = [ libtool autoconf automake gnum4 pkgconfig ]; - - preConfigure = "sh ./autogen.sh"; - crossAttrs = { - # https://github.com/niXman/mingw-builds/blob/master/patches/bzip2/bzip2-1.0.5-slash.patch - postPatch = '' + patchPhase = '' sed -i -e '//s|\\|/|' bzip2.c + sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ + -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ + -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ + -e 's/bzip2recover test/bzip2recover/' \ + Makefile* ''; }; + preBuild = stdenv.lib.optionalString sharedLibrary '' + make -f Makefile-libbz2_so + ''; + + preInstall = stdenv.lib.optionalString sharedLibrary '' + mkdir -p $out/lib + mv libbz2.so* $out/lib + ( cd $out/lib && + ln -s libbz2.so.1.0.? libbz2.so && + ln -s libbz2.so.1.0.? libbz2.so.1 + ) + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + rm $out/bin/bunzip2* $out/bin/bzcat* + ln -s bzip2 $out/bin/bunzip2 + ln -s bzip2 $out/bin/bzcat + ''; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' + ''; + + preConfigure = '' + substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man' + ''; + + makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static"; + + inherit linkStatic; + meta = { homepage = "http://www.bzip.org"; description = "high-quality data compression program"; -- cgit 1.4.1 From aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 23 Nov 2015 11:25:03 +0000 Subject: bzip2: fix cross build on mingw by using autoconf patch --- pkgs/tools/compression/bzip2/default.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'pkgs/tools/compression') diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a485bf5eab68..3e835c30e3d7 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }: let version = "1.0.6"; @@ -15,14 +15,26 @@ in stdenv.mkDerivation { }; crossAttrs = { - patchPhase = '' + buildInputs = [ libtool autoconf automake gnum4 ]; + patches = [ + # original upstream for the autoconf patch is here: + # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch + # but we get the mingw-builds version of the patch, which fixes + # a few more issues + (fetchurl { + url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; + sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; + }) + ]; + patchFlags = "-p0"; + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c - sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ - -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ - -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ - -e 's/bzip2recover test/bzip2recover/' \ - Makefile* ''; + preConfigure = "sh ./autogen.sh"; + # clear native hooks that are not needed with autoconf + preBuild = ""; + preInstall = ""; + postInstall = ""; }; preBuild = stdenv.lib.optionalString sharedLibrary '' -- cgit 1.4.1