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

libuv: bump older systems to 1.29.1 #4433

Merged
merged 1 commit into from May 25, 2019
Merged

libuv: bump older systems to 1.29.1 #4433

merged 1 commit into from May 25, 2019

Conversation

kencu
Copy link
Contributor

@kencu kencu commented May 23, 2019

add patch for older gcc versions to not error on pragmas
add patch for 32bit code to link correctly
add bypass path for Tiger, that doesn't seem to have
a non-cancellable close function available
closes: https://trac.macports.org/ticket/58507

@macportsbot
Copy link

Notifying maintainers:
@michaelld for port libuv.

@macportsbot macportsbot added by: member Created by a member with commit rights maintainer: open Affects an openmaintainer port labels May 23, 2019
@markemer
Copy link
Member

Tiger? That's commitment.

@kencu
Copy link
Contributor Author

kencu commented May 23, 2019

I'm not completely sure I have those defines just right in that GNUC/pragma stuff. We want those pragmas active for clang, as I presume that's why they are there. Also, the MINGW stuff can be left out.

The close$NOCANCEL$UNIX2003 business seems to compile and link on 10.5+, but failed on 10.4. I don't really know how to rigorously test that, but I think that is working OK.

@michaelld
Copy link
Contributor

When I was updating libuv recently, I thought about rearranging the Portfile to have just the release & devel, and then clauses specific for each group of OSs already represented. I decided against it because it seems like libuv needs to be tested with each release and devel commit for compatibility with these older OSs ... and, looks like I was correct this time (¿yay me?)!

@michaelld
Copy link
Contributor

I'll add a note to test these changes out at work tomorrow on some of my build computers including my fresh & new 10.4 PPC boot!

@macportsbot
Copy link

Travis Build #6607 Passed.

Lint results
--->  Verifying Portfile for libuv
Error: Line 74 repeats inclusion of PortGroup obsolete
--->  1 errors and 0 warnings found.

Port libuv success on xcode10.2. Log
Port libuv-devel success on xcode10.2. Log
Port libuv success on xcode9.4. Log
Port libuv-devel success on xcode9.4. Log
Port libuv success on xcode8.3. Log
Port libuv-devel success on xcode8.3. Log
Port libuv success on xcode7.3. Log

add patch for older gcc versions to not error on pragmas
add patch for 32bit code to link correctly
add bypass path for Tiger, that doesn't seem to have
  a non-cancellable close function available
closes: https://trac.macports.org/ticket/58507
@kencu
Copy link
Contributor Author

kencu commented May 23, 2019

I tweaked it a bit -- I think this is more like what we need.

@macportsbot
Copy link

Travis Build #6608 Passed.

Lint results
--->  Verifying Portfile for libuv
Error: Line 74 repeats inclusion of PortGroup obsolete
--->  1 errors and 0 warnings found.

Port libuv success on xcode10.2. Log
Port libuv-devel success on xcode10.2. Log
Port libuv success on xcode9.4. Log
Port libuv-devel success on xcode9.4. Log
Port libuv success on xcode8.3. Log
Port libuv-devel success on xcode8.3. Log
Port libuv success on xcode7.3. Log

@kencu
Copy link
Contributor Author

kencu commented May 23, 2019

see also libuv/libuv#2309 for part of the PR (thought I would got at it bit by bit there)

@michaelld
Copy link
Contributor

Trying this on 10.4 PPC right now. Has to update libiconv first, so it'll be a few hours LOL

@kencu
Copy link
Contributor Author

kencu commented May 24, 2019

I have a feeling I might be able to improve Tiger by making it do the linux thing

#elif defined(__linux__)
return syscall(SYS_close, fd);

but I'm not sure it's worth the spaghetti code...

@michaelld
Copy link
Contributor

This builds nicely on 10.4 PPC. Let me try on 10.5.

@michaelld
Copy link
Contributor

Plenty of "make check" errors, but whatever it does build!

@michaelld
Copy link
Contributor

Worked on 10.5 Intel too. Same "make check" errors; same-same all around. I'm good with this if you are @kencu .

@michaelld
Copy link
Contributor

Interestingly, the compile does have a few warnings (I think just 3), which look easy to fix & would be upstream-able.

@kencu
Copy link
Contributor Author

kencu commented May 25, 2019

Sure, I think it's good to go. I don't know if we'll ever squash all the make check and compile warnings, but pretty functional I believe.

@kencu
Copy link
Contributor Author

kencu commented May 25, 2019

Upstream has set 10.7 as their focus point, but if I'm gentle and don't make too much pasta of their code, they'll accept small fixes that make our life easier on this end.

@kencu kencu merged commit 1735bb1 into macports:master May 25, 2019
@kencu kencu deleted the libuvup branch May 25, 2019 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
by: member Created by a member with commit rights maintainer: open Affects an openmaintainer port
4 participants