Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tclreadline: init at 2.3.8 #66830

Merged
merged 1 commit into from Dec 8, 2020
Merged

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Aug 18, 2019

Motivation for this change

tcl is nice

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@mmahut
Copy link
Member

mmahut commented Aug 18, 2019

@GrahamcOfBorg build tclreadline

@fgaz
Copy link
Member Author

fgaz commented Aug 19, 2019

/nix/store/ffl5ag647lkglhgd2yjdisajn5zzrr78-stdenv-darwin/setup: line 105: patchelf: command not found

right. disabled patchelf on darwin

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will still run configure script twice. I made a pull request fixing that flightaware/tclreadline#22

@fgaz fgaz changed the title tclreadline: init at 2.3.6 tclreadline: init at 2.3.7 Oct 22, 2019
@aanderse
Copy link
Member

@jtojnar good to go?

@jtojnar
Copy link
Contributor

jtojnar commented Oct 30, 2019

One thing I do not like is patching the ELF files. Surely, there must be a better way.

@fgaz
Copy link
Member Author

fgaz commented Nov 16, 2019

Is the binary patching a blocker? I'd write a patch for upstream, but I'm not much knowledgeable about autotools

@fgaz
Copy link
Member Author

fgaz commented Jan 7, 2020

Ping

@fgaz
Copy link
Member Author

fgaz commented Jan 17, 2020

I guess I could do something like

if [ relevant contents of .libs are also present in $out/lib ]; then
  patchelf --set-rpath $(patchelf --print-rpath $executable | sed -s @$builddir/.libs:@@) $executable
else
  echo "Some libraries were not installed correctly"
  exit 1
fi

Would that be better?

@fgaz
Copy link
Member Author

fgaz commented May 7, 2020

@jtojnar what about it?

@jtojnar

This comment has been minimized.

@jtojnar
Copy link
Contributor

jtojnar commented May 8, 2020

Sorry, missed your replies above. Yes that would be nicer.

I tried looking into the autotools build but was not able to determine where the rpath comes from. The only rpath reference in the generated Makefile is

libtclreadline.la: $(libtclreadline_la_OBJECTS) $(libtclreadline_la_DEPENDENCIES) $(EXTRA_libtclreadline_la_DEPENDENCIES) 
	$(AM_V_CCLD)$(libtclreadline_la_LINK) -rpath $(libdir) $(libtclreadline_la_OBJECTS) $(libtclreadline_la_LIBADD) $(LIBS)

and that should be $out/lib.

@stale
Copy link

stale bot commented Nov 5, 2020

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 5, 2020
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 66830 run on x86_64-linux 1

1 package built:
  • tclreadline

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 25, 2020
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 66830 run on x86_64-darwin 1

1 package built:
  • tclreadline

@fgaz
Copy link
Member Author

fgaz commented Dec 6, 2020

@jtojnar here we go, better late than never :)

I implemented what I suggested here #66830 (comment)

@fgaz fgaz changed the title tclreadline: init at 2.3.7 tclreadline: init at 2.3.8 Dec 6, 2020
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 66830 run on x86_64-linux 1

1 package built:
  • tclreadline

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 66830 run on x86_64-darwin 1

1 package built:
  • tclreadline

@SuperSandro2000 SuperSandro2000 merged commit 67b553a into NixOS:master Dec 8, 2020
@fgaz fgaz deleted the tclreadline/init branch December 8, 2020 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants