From a83d2f7c918a5badab204d57d8620adb926e618b Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 14 Jun 2022 00:12:53 +0300 Subject: [PATCH] gobject-introspection: cross improvements gobject-introspection: copy $dev/share/gobj.../tests when cross-compiling gobject-introspection: add giscanner-ignore-error-return-codes-from-ldd-wrapper patch polkit-aarch64-unknown-linux-gnu> [102/104] Generating src/polkitagent/PolkitAgent-1.0.gir with a custom command polkit-aarch64-unknown-linux-gnu> FAILED: src/polkitagent/PolkitAgent-1.0.gir polkit-aarch64-unknown-linux-gnu> -gobject-introspection-wrapped-1.72.0-dev/bin/g-ir-scanner --no-libtool --namespace=PolkitAgent --nsversion=1.0 --warn-all --output src/polkitagent/PolkitAgent-1.0.gir --c-include=polkitagent/polkitagent.h - D_POLKIT_AGENT_COMPILATION -D_POLKIT_COMPILATION -I/build/source/src/polkitagent -I/build/source/build/src/polkitagent -I/build/source/. -I/build/source/build/. -I/build/source/src/. -I/build/source/build/src/. --filelist=/build/source/build/src/polkitagent/libpolkit-agent-1.so.0.0.0 .p/PolkitAgent_1.0_gir_filelist --include=Gio-2.0 --include-uninstalled=src/polkit/Polkit-1.0.gir --pkg-export=polkit-agent-1 --cflags-begin -DHAVE_CONFIG_H -I/build/source/. -I/build/source/build/. -I/build/source/src/. -I/build/source/build/src/. -I/nix/store/lqncny8acp6hkclsgbfnrb 65i9hscsmn-expat-aarch64-unknown-linux-gnu-2.4.8-dev/include -I-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include/gio-unix-2.0 -I-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include -I/nix/store/qm1wa x4c7sgf5h3b6dhspxb5miayjyc9-glib-aarch64-unknown-linux-gnu-2.72.2-dev/include/glib-2.0 -I-glib-aarch64-unknown-linux-gnu-2.72.2/lib/glib-2.0/include -I-gobject-introspection-aarch64-unknown-linux-gn u-1.72.0-dev/include/gobject-introspection-1.0 --cflags-end --add-include-path=-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0-dev/share/gir-1.0 --add-include-path=/build/source/build/src/polkit -L/build/source/build/src/polkitagent --library polkit-agent-1 -L/build/source/build/src/polkit -L-expat-aarch64-unknown-linux-gnu-2.4.8/lib --extra-library=expat -L-glib-aarch64-unknown-linux-gnu-2.72.2/lib --extra-library=gio-2.0 --ex tra-library=gobject-2.0 --extra-library=glib-2.0 -L-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0/lib --extra-library=girepository-1.0 --sources-top-dirs /build/source/subprojects/ --sources-top-dirs /build/source/build/subprojects/ polkit-aarch64-unknown-linux-gnu> g-ir-scanner: link: aarch64-unknown-linux-gnu-gcc -o /build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0 /build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0.o -L. -Wl,-rpath,. -Wl,--no-as-needed -L/build/source/build/src/polkitagent -Wl ,-rpath,/build/source/build/src/polkitagent -L/build/source/build/src/polkit -Wl,-rpath,/build/source/build/src/polkit -L-expat-aarch64-unknown-linux-gnu-2.4.8/lib -Wl,-rpath,-expat-aarch64-unknown- linux-gnu-2.4.8/lib -L-glib-aarch64-unknown-linux-gnu-2.72.2/lib -Wl,-rpath,-glib-aarch64-unknown-linux-gnu-2.72.2/lib -L-gobject-introspection-aarch64-unk nown-linux-gnu-1.72.0/lib -Wl,-rpath,-gobject-introspection-aarch64-unknown-linux-gnu-1.72.0/lib -lpolkit-agent-1 -lexpat -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgirepository-1.0 -L-glib-aarch64-unknow n-linux-gnu-2.72.2/lib -lgio-2.0 -lgobject-2.0 -Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 polkit-aarch64-unknown-linux-gnu> Traceback (most recent call last): polkit-aarch64-unknown-linux-gnu> File "-gobject-introspection-wrapped-1.72.0-dev/bin/.g-ir-scanner-wrapped", line 99, in polkit-aarch64-unknown-linux-gnu> sys.exit(scanner_main(sys.argv)) polkit-aarch64-unknown-linux-gnu> File "-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/scannermain.py", line 646, in scanner_main polkit-aarch64-unknown-linux-gnu> shlibs = create_binary(transformer, options, args) polkit-aarch64-unknown-linux-gnu> File "-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/scannermain.py", line 471, in create_binary polkit-aarch64-unknown-linux-gnu> shlibs = resolve_shlibs(options, binary, options.libraries) polkit-aarch64-unknown-linux-gnu> File "-gobject-introspection-wrapped-1.72.0/lib/gobject-introspection/giscanner/shlibs.py", line 179, in resolve_shlibs polkit-aarch64-unknown-linux-gnu> _resolve_non_libtool(options, binary, non_libtool)) polkit-aarch64-unknown-linux-gnu> File "-gobject-introspection-wrapped-1.72.0/lib/go bject-introspection/giscanner/shlibs.py", line 112, in _resolve_non_libtool polkit-aarch64-unknown-linux-gnu> output = subprocess.check_output(args) polkit-aarch64-unknown-linux-gnu> File "-python3-3.10.5/lib/python3.10/subprocess.py", line 420, in check_output polkit-aarch64-unknown-linux-gnu> return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, polkit-aarch64-unknown-linux-gnu> File "-python3-3.10.5/lib/python3.10/subprocess.py", line 524, in run polkit-aarch64-unknown-linux-gnu> raise CalledProcessError(retcode, process.args, polkit-aarch64-unknown-linux-gnu> subprocess.CalledProcessError: Command '['-prelink-unstable-2019-06-24/bin/prelink-rtld', '/build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0']' returned non-zero exit status 127. polkit-aarch64-unknown-linux-gnu> [103/104] Generating src/polkit/Polkit-1.0.typelib with a custom command polkit-aarch64-unknown-linux-gnu> ninja: build stopped: subcommand failed. exit status 127 gobject-introspection: this should fix pkgsMusl pkgsStatic by not putting `/nix/store/iw35xj69w190w7vw17l8mac8srg0vpyz-gobject-introspection-static-x86_64-unknown-linux-musl-1.72.0.drv` in their dependency tree when gobject-introspection is in nativeBuildInputs ex .#pkgsStatic.libjxl gobject-introspection: pc file: use binaries from path instead of a abs path to them fixes issues in networkmanager and some other packages ``` gi._error.GError: g-invoke-error-quark: Could not locate g_option_error_quark: /nix/store/...-glib-aarch64-unknown-linux-gnu-2.72.2/lib/libglib-2.0.so.0: cannot open shared object file: No such file or directory (1) ``` see comment gobject-introspection: propagate gobject-introspection-unwrapped in wrapper with this it is no longer needed to put gobject-introspection in buildInputs in addition to nativeBuildInputs --- .../gobject-introspection/default.nix | 24 +++++++++++--- ...-error-return-codes-from-ldd-wrapper.patch | 32 +++++++++++++++++++ .../gobject-introspection/wrapper.nix | 8 +++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/gobject-introspection/giscanner-ignore-error-return-codes-from-ldd-wrapper.patch diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 82be84e1f1d..bfcb9a44014 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -27,7 +27,7 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; version = "1.72.0"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 python3 - setupHook # move .gir files + finalAttrs.setupHook # move .gir files ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ @@ -105,6 +105,10 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.gobject-introspection-unwrapped.devdoc} $devdoc + # these are uncompiled c and header files which aren't installed when cross-compiling because + # code that installs them is in tests/meson.build which is only run when not cross-compiling + # pygobject3 needs them + cp -r ${buildPackages.gobject-introspection-unwrapped.dev}/share/gobject-introspection-1.0/tests $dev/share/gobject-introspection-1.0/tests ''; preCheck = '' @@ -120,11 +124,21 @@ stdenv.mkDerivation rec { rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; + # when cross-compiling and using the wrapper then when a package looks up the g_ir_X + # variable with pkg-config they'll get the host version which can't be run + # switch the variables to use g_ir_X from path instead of an absolute path + postFixup = lib.optionalString (!lib.hasSuffix "wrapped" finalAttrs.pname) '' + find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do + substituteInPlace "$pc" \ + --replace '=''${bindir}/g-ir' '=g-ir' + done + ''; + setupHook = ./setup-hook.sh; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; }; @@ -144,4 +158,4 @@ stdenv.mkDerivation rec { automatically provide bindings to call into the C library. ''; }; -} +}) diff --git a/pkgs/development/libraries/gobject-introspection/giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/pkgs/development/libraries/gobject-introspection/giscanner-ignore-error-return-codes-from-ldd-wrapper.patch new file mode 100644 index 00000000000..bf1c1f1b713 --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -0,0 +1,32 @@ +From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 5 Sep 2018 16:46:52 +0200 +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper + +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. +It is not an error per se, but it breaks subprocess.check_output(). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/shlibs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..7a1a72fe 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): + args.extend(['otool', '-L', binary.args[0]]) + else: + args.extend(['ldd', binary.args[0]]) +- output = subprocess.check_output(args) ++ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout + if isinstance(output, bytes): + output = output.decode("utf-8", "replace") + +-- +2.25.1 + + diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 44d31540e64..e71f2f2fb46 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -7,9 +7,13 @@ # to build, run # `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"` -gobject-introspection-unwrapped.overrideAttrs (_previousAttrs: { +gobject-introspection-unwrapped.overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; - postFixup = '' + depsTargetTargetPropagated = [ gobject-introspection-unwrapped ]; + # failure in e.g. pkgsCross.aarch64-multiplatform.polkit + # subprocess.CalledProcessError: Command '['/nix/store/...-prelink-unstable-2019-06-24/bin/prelink-rtld', '/build/source/build/tmp-introspectzp2ldkyk/PolkitAgent-1.0']' returned non-zero exit status 127. + patches = previousAttrs.patches ++ [ ./giscanner-ignore-error-return-codes-from-ldd-wrapper.patch ]; + postFixup = (previousAttrs.postFixup or "") + '' mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6508ddc8b2f..ac44da1d0c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17899,7 +17899,7 @@ with pkgs; gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; - gobject-introspection = if (stdenv.hostPlatform != stdenv.targetPlatform) + gobject-introspection = if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then callPackage ../development/libraries/gobject-introspection/wrapper.nix { } else gobject-introspection-unwrapped; gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection {