commit b7c59cc7dc4dd951e8a3ba5fdee0306733e165c9 · pyrox.dev/nixpkgs

-103

pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch

···

       1
       1
       -
       From ea1bc0fcfd33191002c5d1f7072c1c02bb7ec4af Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Alyssa Ross <hi@alyssa.is>

     

       3
       3
       -
       Date: Thu, 14 Nov 2019 15:45:46 +0000

     

       4
       4
       -
       Subject: [PATCH] Fix build on BSD systems

     

       5
       5
       -
       

     

       6
       6
       -
       I tested FreeBSD, DragonflyBSD, NetBSD and OpenBSD and the endian

     

       7
       7
       -
       macros weren't necessary (and in fact caused errors) on all of them.

     

       8
       8
       -
       

     

       9
       9
       -
       Because OpenBSD ships with an ancient GCC that doesn't support the

     

       10
       10
       -
       checked addition/multiplication builtins, the build there would fail

     

       11
       11
       -
       unless built with CC=cc or CC=clang.  I changed configure.ac to prefer

     

       12
       12
       -
       cc over gcc, so that the distribution's compiler preference is

     

       13
       13
       -
       respected.  (The default is [gcc cc]).  I had to move AC_PROG_CC above

     

       14
       14
       -
       LT_INIT because otherwise LT_INIT would run AC_PROG_CC first, and we

     

       15
       15
       -
       wouldn't have a chance to use non-default parameters.

     

       16
       16
       -
       ---

     

       17
       17
       -
        configure.ac          |  2 +-

     

       18
       18
       -
        include/util/compat.h | 13 +++++--------

     

       19
       19
       -
        lib/common/dirstack.c |  1 +

     

       20
       20
       -
        lib/common/mkdir_p.c  |  2 +-

     

       21
       21
       -
        4 files changed, 8 insertions(+), 10 deletions(-)

     

       22
       22
       -
       

     

       23
       23
       -
       diff --git a/configure.ac b/configure.ac

     

       24
       24
       -
       index 018b3f6..19ea0ed 100644

     

       25
       25
       -
       --- a/configure.ac

     

       26
       26
       -
       +++ b/configure.ac

     

       27
       27
       -
       @@ -3,8 +3,8 @@ AC_INIT([squashfs-tools-ng], [0.7], [goliath@infraroot.at], squashfs-tools-ng)

     

       28
       28
       -
        AC_CONFIG_MACRO_DIR([m4])

     

       29
       29
       -
        AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])

     

       30
       30
       -
        AM_SILENT_RULES([yes])

     

       31
       31
       -
       +AC_PROG_CC([cc gcc clang])

     

       32
       32
       -
        LT_INIT

     

       33
       33
       -
       -AC_PROG_CC

     

       34
       34
       -
        AC_PROG_CC_C99

     

       35
       35
       -
        AC_PROG_INSTALL

     

       36
       36
       -
        AC_SYS_LARGEFILE

     

       37
       37
       -
       diff --git a/include/util/compat.h b/include/util/compat.h

     

       38
       38
       -
       index 74d0b6f..f53fd0e 100644

     

       39
       39
       -
       --- a/include/util/compat.h

     

       40
       40
       -
       +++ b/include/util/compat.h

     

       41
       41
       -
       @@ -7,6 +7,10 @@

     

       42
       42
       -
        #ifndef COMPAT_H

     

       43
       43
       -
        #define COMPAT_H

     

       44
       44
       -
        

     

       45
       45
       -
       +#ifndef __linux__

     

       46
       46
       -
       +#define O_PATH 0

     

       47
       47
       -
       +#endif

     

       48
       48
       -
       +

     

       49
       49
       -
        #if defined(__APPLE__)

     

       50
       50
       -
        #include <libkern/OSByteOrder.h>

     

       51
       51
       -
        

     

       52
       52
       -
       @@ -17,14 +21,8 @@

     

       53
       53
       -
        #define le32toh(x) OSSwapLittleToHostInt32(x)

     

       54
       54
       -
        #define le16toh(x) OSSwapLittleToHostInt16(x)

     

       55
       55
       -
        #define le64toh(x) OSSwapLittleToHostInt64(x)

     

       56
       56
       -
       -#elif defined(__OpenBSD__)

     

       57
       57
       -
       +#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

     

       58
       58
       -
        #include <sys/endian.h>

     

       59
       59
       -
       -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)

     

       60
       60
       -
       -#include <sys/endian.h>

     

       61
       61
       -
       -

     

       62
       62
       -
       -#define le16toh(x) letoh16(x)

     

       63
       63
       -
       -#define le32toh(x) letoh32(x)

     

       64
       64
       -
       -#define le64toh(x) letoh64(x)

     

       65
       65
       -
        #elif defined(_WIN32) || defined(__WINDOWS__)

     

       66
       66
       -
        #define htole16(x) (x)

     

       67
       67
       -
        #define htole32(x) (x)

     

       68
       68
       -
       @@ -89,7 +87,6 @@

     

       69
       69
       -
        #else

     

       70
       70
       -
        #include <sys/types.h>

     

       71
       71
       -
        #include <sys/stat.h>

     

       72
       72
       -
       -#include <sys/sysmacros.h>

     

       73
       73
       -
        #endif

     

       74
       74
       -
        

     

       75
       75
       -
        #endif /* COMPAT_H */

     

       76
       76
       -
       diff --git a/lib/common/dirstack.c b/lib/common/dirstack.c

     

       77
       77
       -
       index 8f73898..f8d1278 100644

     

       78
       78
       -
       --- a/lib/common/dirstack.c

     

       79
       79
       -
       +++ b/lib/common/dirstack.c

     

       80
       80
       -
       @@ -5,6 +5,7 @@

     

       81
       81
       -
         * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>

     

       82
       82
       -
         */

     

       83
       83
       -
        #include "common.h"

     

       84
       84
       -
       +#include "util/compat.h"

     

       85
       85
       -
        

     

       86
       86
       -
        #include <string.h>

     

       87
       87
       -
        #include <stdlib.h>

     

       88
       88
       -
       diff --git a/lib/common/mkdir_p.c b/lib/common/mkdir_p.c

     

       89
       89
       -
       index cb433b3..95187ba 100644

     

       90
       90
       -
       --- a/lib/common/mkdir_p.c

     

       91
       91
       -
       +++ b/lib/common/mkdir_p.c

     

       92
       92
       -
       @@ -7,7 +7,7 @@

     

       93
       93
       -
        #include "common.h"

     

       94
       94
       -
        

     

       95
       95
       -
        #include <string.h>

     

       96
       96
       -
       -#include <alloca.h>

     

       97
       97
       -
       +#include <stdlib.h>

     

       98
       98
       -
        #include <stdio.h>

     

       99
       99
       -
        #include <errno.h>

     

       100
       100
       -
        

     

       101
       101
       -
       -- 

     

       102
       102
       -
       2.23.0

     

       103
       103
       -

+6 -8

pkgs/tools/filesystems/squashfs-tools-ng/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, fetchpatch, autoreconfHook, doxygen, graphviz, perl

     

       2
       2
       -
       , pkgconfig, lz4, xz, zlib, zstd

     

       1
       1
       +
       { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig

     

       2
       2
       +
       , lz4, xz, zlib, zstd

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "squashfs-tools-ng";

     

       7
       7
       -
         version = "0.7";

     

       7
       7
       +
         version = "0.8";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "01yn621dnsfhrah3qj1xh6ynag7r3nvihc510sa5frapkyg9nw8n";

     

       11
       11
       +
           sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = lib.optional (!stdenv.isLinux) ./0001-Fix-build-on-BSD-systems.patch;

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]

     

       17
       17
       -
                             ++ lib.optional (!stdenv.isLinux) autoreconfHook;

     

       14
       14
       +
         nativeBuildInputs = [ doxygen graphviz pkgconfig perl ];

     

       18
       15
        
         buildInputs = [ zlib xz lz4 zstd ];

     

       19
       16
        
       

     

       20
       17
        
         meta = with lib; {

     
···

       22
       19
        
           license = licenses.gpl3Plus;

     

       23
       20
        
           maintainers = with maintainers; [ qyliss ];

     

       24
       21
        
           platforms = platforms.unix;

     

       22
       22
       +
           broken = stdenv.isDarwin;

     

       25
       23
        
         };

     

       26
       24
        
       }