Opened 17 years ago

Closed 17 years ago

Last modified 15 years ago

#11438 closed enhancement (fixed)

REVISION: zlib universal

Reported by: ryandesign (Ryan Carsten Schmidt) Owned by: ryandesign (Ryan Carsten Schmidt)
Priority: Low Milestone:
Component: ports Version:
Keywords: Cc: ryandesign (Ryan Carsten Schmidt)
Port:

Description

Since we seem to be on a push to make universal ports optionally available, and I've had some experience building zlib universal, I wanted to provide a patch to add a +universal variant to the zlib 1.2.3 portfile.

Attachments (3)

zlib-1.2.3-universal.diff (1.1 KB) - added by ryandesign (Ryan Carsten Schmidt) 17 years ago.
add a +universal variant
zlib-universal-eridius.diff (2.8 KB) - added by kballard (Lily Ballard) 17 years ago.
zlib-universal-third.diff (2.7 KB) - added by pipping@… 17 years ago.

Download all attachments as: .zip

Change History (12)

Changed 17 years ago by ryandesign (Ryan Carsten Schmidt)

Attachment: zlib-1.2.3-universal.diff added

add a +universal variant

comment:1 Changed 17 years ago by kballard (Lily Ballard)

I took a look at that patch, and it's pretty ugly.

Here's one that cleans it up, outputs messages to the user to tell them that it's building libz.a after destroot, and indents everything better.

Changed 17 years ago by kballard (Lily Ballard)

Attachment: zlib-universal-eridius.diff added

comment:2 Changed 17 years ago by kballard (Lily Ballard)

Incidentally, the original patch didn't even work (the reinplace was broken).

comment:3 Changed 17 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… landonf@… added

Eridius: Thank you for cleaning it up. You obviously know a lot more tcl than I do. I was hoping there would be a more elegant way than what I did.

I would however prefer to keep patches to a single purpose. That is: I'd prefer we not make whitespace changes and also functional changes at the same time. It makes it very difficult to later figure out what the substantive changes were, if svn diff shows the entire file to have changed due to differing whitespace.

FYI: My original reinplace did work, but required GNU sed, which I already had installed; I didn't realize BSD sed which Mac OS X provides doesn't support the \0 notation. To support BSD sed, I had also reached the same solution as you, grouping the entire search pattern and using \1 in the replacement.

Pipping: It looks like you only removed "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" from LDFLAGS? An older version of the Apple tech note recommended using that, and I seem to still have a habit of using it, though the current documentation no longer lists it, and it seems to work just fine without it in this case.

In summary: I would be happy if zlib-universal-third.diff were applied. (Well, I'd be happier if functional changes and whitespace changes were made in two separate commits.) Now we just need approval from the maintainer. Landon, what do you think?

Changed 17 years ago by pipping@…

Attachment: zlib-universal-third.diff added

comment:4 Changed 17 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: landonf@… removed
Owner: changed from macports-dev@… to ryandesign@…

Looks like Landon has abandoned the zlib port. I'll took it over in r22499.

comment:5 Changed 17 years ago by kballard (Lily Ballard)

Resolution: fixed
Status: newclosed

Until somebody tests it on PPC, I would not recommend removing the -Wl,-syslibroot because the SDK is irrelevant on i386, and so I'm not willing to risk breaking cross-compilation from PPC.

That said, as you made zlib openmaintainer, I'm going ahead and committing my version. I know, it would be nice to separate whitespace changes from functional, but it's hard to do that at this point, and there's also far more functional changes than whitespace changes.

Committed in r22776.

comment:6 Changed 17 years ago by ryandesign (Ryan Carsten Schmidt)

Component: baseports
Milestone: Available Ports

I am on PPC and I did test it there.

comment:7 Changed 17 years ago by jmpp@…

Milestone: Available PortsPort Enhancements

comment:8 Changed 17 years ago by nox@…

Priority: Nice to haveLow
Summary: PATCH: zlib universalREVISION: zlib universal

comment:9 Changed 15 years ago by (none)

Milestone: Port Enhancements

Milestone Port Enhancements deleted

Note: See TracTickets for help on using tickets.