-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Try and rescue macos libpng builds for Pharo
On macosx, zlib is a pre-requisite of libpng, so it has to be compiled While at it, upgrade libpng to 1.16.37 due to CVE-2019-7317 - see http://www.libpng.org/pub/png/libpng.html
- Loading branch information
1 parent
08a50c2
commit 61faabb
Showing
22 changed files
with
155 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| ifndef THIRDPARTYDIR | ||
| include ../common/Makefile.lib.extra | ||
| endif | ||
| include ../../third-party/zlib.spec | ||
|
|
||
| # plugin definitions | ||
| ZLIBURL:=$(zlib_spec_download_url) | ||
| ZLIBLIBNAME:=$(zlib_spec_product_name_macOS) | ||
| ZLIBDIR:=$(THIRDPARTYDIR)/$(zlib_spec_unpack_dir_name) | ||
| ZLIBARCHIVE:=$(THIRDPARTYCACHEDIR)/$(zlib_spec_archive_name) | ||
| ZLIBLIB:=$(THIRDPARTYINSTALLDIR)/$(ZLIBLIBNAME) | ||
| ZLIBSYMLINKS:=$(zlib_spec_symlinks_macOS) | ||
|
|
||
| # ensure third-party library is built and recognised by plugins | ||
| INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR) | ||
| EXTRALIBS:=$(EXTRALIBS) $(ZLIBLIB) | ||
| PLUGINREQS:=$(THIRDPARTYLIBS) | ||
|
|
||
| $(ZLIBARCHIVE): | ||
| curl -o $(ZLIBARCHIVE) -L $(ZLIBURL) | ||
|
|
||
| $(THIRDPARTYLIBDIR)/$(ZLIBLIBNAME): $(ZLIBARCHIVE) | ||
| tar x -f $(ZLIBARCHIVE) -C $(THIRDPARTYDIR) | ||
| cd $(ZLIBDIR) \ | ||
| && ./configure --prefix='$(THIRDPARTYOUTDIR)' --archs='-arch i386' \ | ||
| && make \ | ||
| && make install | ||
|
|
||
| $(ZLIBLIB): $(THIRDPARTYLIBDIR)/$(ZLIBLIBNAME) | ||
| cp -f $(THIRDPARTYLIBDIR)/$(ZLIBLIBNAME) $(THIRDPARTYINSTALLDIR) | ||
| install_name_tool -id "@executable_path/Plugins/$(ZLIBLIBNAME)" $(ZLIBLIB) | ||
| @echo "Installing links" | ||
| @for each in $(THIRDPARTYLIBDIR)/$(ZLIBSYMLINKS); do \ | ||
| if [ -L $$each ]; then \ | ||
| cp -a $$each $(THIRDPARTYINSTALLDIR); \ | ||
| fi \ | ||
| done | ||
| @echo "DONE" | ||
|
|
||
| zlib: $(ZLIBLIB) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.