diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libgpg-error')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libgpg-error/default.nix | 80 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch | 142 |
2 files changed, 222 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix new file mode 100644 index 000000000000..ec2b614ee9ca --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -0,0 +1,80 @@ +{ stdenv, lib, buildPackages, fetchurl, gettext +, genPosixLockObjOnly ? false +}: let + genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { + buildPhase = '' + cd src + make gen-posix-lock-obj + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 gen-posix-lock-obj $out/bin + ''; + + outputs = [ "out" ]; + outputBin = "out"; + }; +in stdenv.mkDerivation (rec { + pname = "libgpg-error"; + version = "1.42"; + + src = fetchurl { + url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-/AfnD2xhX4xPWQqON6m43S4soelAj45gRZxnRSuSXiM="; + }; + + # 1.42 breaks (some?) cross-compilation (e.g. x86_64 -> aarch64). + # Backporting this fix (merged in upstream master but no release cut) by David Michael <fedora.dm0@gmail.com> https://dev.gnupg.org/rE33593864cd54143db594c4237bba41e14179061c + patches = [ ./fix-1.42-cross-compilation.patch ]; + + postPatch = '' + sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabi.h + '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h + '' + lib.optionalString (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.i686-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + ''; + + outputs = [ "out" "dev" "info" ]; + outputBin = "dev"; # deps want just the lib, most likely + + # If architecture-dependent MO files aren't available, they're generated + # during build, so we need gettext for cross-builds. + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gettext ]; + + postConfigure = + lib.optionalString stdenv.isSunOS + # For some reason, /bin/sh on OpenIndiana leads to this at the end of the + # `config.status' run: + # ./config.status[1401]: shift: (null): bad number + # (See <https://hydra.nixos.org/build/2931046/nixlog/1/raw>.) + # Thus, re-run it with Bash. + "${stdenv.shell} config.status"; + + doCheck = true; # not cross + + meta = with lib; { + homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; + description = "A small library that defines common error values for all GnuPG components"; + + longDescription = '' + Libgpg-error is a small library that defines common error values + for all GnuPG components. Among these are GPG, GPGSM, GPGME, + GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard + Daemon and possibly more in the future. + ''; + + license = licenses.lgpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; + }; +} // genPosixLockObjOnlyAttrs) diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch b/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch new file mode 100644 index 000000000000..6c3099f72144 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/fix-1.42-cross-compilation.patch @@ -0,0 +1,142 @@ +diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh +index a710f0c..258eec6 100755 +--- a/src/gen-lock-obj.sh ++++ b/src/gen-lock-obj.sh +@@ -1,136 +1,136 @@ + #! /bin/sh + # + # gen-lock-obj.sh - Build tool to construct the lock object. + # + # Copyright (C) 2020, 2021 g10 Code GmbH + # + # This file is part of libgpg-error. + # + # libgpg-error is free software; you can redistribute it and/or + # modify it under the terms of the GNU Lesser General Public License + # as published by the Free Software Foundation; either version 2.1 of + # the License, or (at your option) any later version. + # + # libgpg-error is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + # Lesser General Public License for more details. + # + # You should have received a copy of the GNU Lesser General Public + # License along with this program; if not, see <https://www.gnu.org/licenses/>. + # + + # + # Following variables should be defined to invoke this script + # + # CC + # OBJDUMP + # AWK + # ac_ext + # ac_object + # host + # LOCK_ABI_VERSION + # + # An example: + # + # LOCK_ABI_VERSION=1 host=x86_64-pc-linux-gnu host_alias=x86_64-linux-gnu \ + # CC=$host_alias-gcc OBJDUMP=$host_alias-objdump ac_ext=c ac_objext=o \ + # AWK=gawk ./gen-lock-obj.sh + # + +-if test -n `echo -n`; then ++if test -n "`echo -n`"; then + ECHO_C='\c' + ECHO_N='' + else + ECHO_C='' + ECHO_N='-n' + fi + + if test "$1" = --disable-threads; then + cat <<EOF + ## lock-obj-pub.$host.h - NO LOCK SUPPORT + ## File created by gen-lock-obj.sh - DO NOT EDIT + ## To be included by mkheader into gpg-error.h + + /* Dummy object - no locking available. */ + typedef struct + { + long _vers; + } gpgrt_lock_t; + + #define GPGRT_LOCK_INITIALIZER {-1} + EOF + else + AWK_VERSION_OUTPUT=$($AWK 'BEGIN { print PROCINFO["version"] }') + if test -n "$AWK_VERSION_OUTPUT"; then + # It's GNU awk, which supports PROCINFO. + AWK_OPTION=--non-decimal-data + fi + + cat <<'EOF' >conftest.$ac_ext + #include <pthread.h> + pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER; + EOF + + if $CC -c conftest.$ac_ext; then : + ac_mtx_size=$($OBJDUMP -j .bss -t conftest.$ac_objext \ + | $AWK $AWK_OPTION ' + /mtx$/ { mtx_size = int("0x" $5) } + END { print mtx_size }') + else + echo "Can't determine mutex size" + exit 1 + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + cat <<EOF + ## lock-obj-pub.$host.h + ## File created by gen-lock-obj.sh - DO NOT EDIT + ## To be included by mkheader into gpg-error.h + + typedef struct + { + long _vers; + union { + volatile char _priv[$ac_mtx_size]; + long _x_align; + long *_xp_align; + } u; + } gpgrt_lock_t; + + EOF + + # FIXME: Support different alignment conditions of: + # + # USE_16BYTE_ALIGNMENT + # USE_DOUBLE_FOR_ALIGNMENT + # USE_LONG_DOUBLE_FOR_ALIGNMENT + # + + echo ${ECHO_N} "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{${ECHO_C}" + + i=0 + while test "$i" -lt $ac_mtx_size; do + if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then + echo ' \' + echo ${ECHO_N} " ${ECHO_C}" + fi + echo ${ECHO_N} "0${ECHO_C}" + if test "$i" -lt $(($ac_mtx_size - 1)); then + echo ${ECHO_N} ",${ECHO_C}" + fi + i=$(( i + 1 )) + done + fi + + cat <<'EOF' + }}} + ## + ## Local Variables: + ## mode: c + ## buffer-read-only: t + ## End: + ## + EOF + + exit 0 |