Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

irssi: add HEAD #40011

Closed
wants to merge 1 commit into from
Closed

irssi: add HEAD #40011

wants to merge 1 commit into from

Conversation

dunn
Copy link
Contributor

@dunn dunn commented May 23, 2015

No description provided.

patch :DATA

def install
# Fix Perl build flags
conf = build.head? ? "configure.ac" : "configure"
inreplace conf do |s|
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was this a Mac- or Homebrew-specific patch? If it's not I can send it upstream.

Copy link
Member

Choose a reason for hiding this comment

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

No idea. It was added in 2009. It looks like it was intended to be Homebrew specific.

Copy link
Member

Choose a reason for hiding this comment

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

I think it'd be good to try and either remove it or get it upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can build and run Irssi (with Perl stuff) without it, so I removed it.

Copy link
Member

Choose a reason for hiding this comment

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

The difference in output between patch and no patch is:

- -arch x86_64 -arch i386 -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -fstack-protector  -I/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE %
+ -g -pipe -fno-common -DPERL_DARWIN -fno-strict-aliasing -fstack-protector  -I/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE

And:

- -arch x86_64 -arch i386 -fstack-protector  -L/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE -lperl
+ -fstack-protector  -L/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE -lperl

Copy link
Member

Choose a reason for hiding this comment

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

So it's trying to build universally unconditionally? I think superenv will actually handle this for us now. Mind checking that out, @DomT4 (i.e. seeing if you remove the patch if it makes a universal binary)?

Copy link
Member

Choose a reason for hiding this comment

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

No problem here:

checking build system type... x86_64-apple-darwin14.4.0
checking host system type... x86_64-apple-darwin14.4.0
~> file /usr/local/Cellar/irssi/0.8.17_2/bin/*
/usr/local/Cellar/irssi/0.8.17_2/bin/botti: Mach-O 64-bit executable x86_64
/usr/local/Cellar/irssi/0.8.17_2/bin/irssi: Mach-O 64-bit executable x86_64

@@ -21,7 +27,7 @@ class Irssi < Formula
depends_on "openssl" => :recommended
depends_on "dante" => :optional

# Fix Perl build flags and paths in man page
# Make paths in man page Homebrew-specific
Copy link
Member

Choose a reason for hiding this comment

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

Can you switch this to using an inreplace instead (and ideally file an upstream issue to complain about configure not processing this file correctly)? Thanks!

@dunn
Copy link
Contributor Author

dunn commented May 26, 2015

irssi/irssi#251

@DomT4
Copy link
Member

DomT4 commented May 26, 2015

This looks 💯 now if Mike is happy too.

@dunn
Copy link
Contributor Author

dunn commented May 26, 2015

Should I remove the description?

@DomT4
Copy link
Member

DomT4 commented May 26, 2015

👍, Thanks!

@DomT4
Copy link
Member

DomT4 commented May 26, 2015

Merged in 5ac6367. Thanks @dunn! 🚀

@dunn dunn deleted the irssi branch May 26, 2015 20:52
@Homebrew Homebrew locked and limited conversation to collaborators Jul 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants