Mercurial > mxe-octave
changeset 3296:8f0877237c55
[MSVC] Update to newer libmng.
* src/libmng.png: Remove MSVC-specific paths that disabled lcms1.
* src/msvc-libmng-1.patch: Add -no-undefined to libtool flags.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sat, 09 Nov 2013 23:28:04 -0500 |
| parents | 14d0e2102581 |
| children | 42a34b8928a6 |
| files | src/libmng.mk src/msvc-libmng-1.patch |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libmng.mk Sat Nov 09 23:28:04 2013 -0500 +++ b/src/libmng.mk Sat Nov 09 23:28:04 2013 -0500 @@ -8,9 +8,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := zlib jpeg lcms -ifneq ($(MXE_SYSTEM),msvc) - $(PKG)_DEPS += lcms1 -endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \ @@ -26,8 +23,5 @@ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ && $(CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)' -j '$(JOBS)' install - if test x$(MXE_SYSTEM) = xmsvc; then \ - $(SED) -i -e 's/lcms//' '$(1)/libmng.pc'; \ - fi + $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)' endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msvc-libmng-1.patch Sat Nov 09 23:28:04 2013 -0500 @@ -0,0 +1,11 @@ +diff -ur libmng-2.0.2-orig/Makefile.am libmng-2.0.2/Makefile.am +--- libmng-2.0.2-orig/Makefile.am 2013-03-05 06:59:27 -0500 ++++ libmng-2.0.2/Makefile.am 2013-11-09 12:13:37 -0500 +@@ -9,6 +9,7 @@ + + # libmng release @VERSION@ + libmng_la_LDFLAGS = \ ++ -no-undefined \ + -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ + + lib_LTLIBRARIES = libmng.la