Mercurial > forge
changeset 5780:e88eb9484fb0 octave-forge
mingw32/graphicsmagick: fix dependencies for magick++ dll and build script to enable parallel make
| author | lindnerb |
|---|---|
| date | Thu, 18 Jun 2009 14:47:22 +0000 |
| parents | b3b34f027427 |
| children | 4ed880dce465 |
| files | admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.3-3.patch admin/Windows/mingw32/graphicsmagick/build-1.3.3-3.sh |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.3-3.patch Thu Jun 18 06:11:14 2009 +0000 +++ b/admin/Windows/mingw32/graphicsmagick/GraphicsMagick-1.3.3-3.patch Thu Jun 18 14:47:22 2009 +0000 @@ -58,12 +58,12 @@ Magick++/lib/$(DEPDIR)/$(am__dirstamp) Magick++/lib/libGraphicsMagick++.la: $(Magick___lib_libGraphicsMagick___la_OBJECTS) $(Magick___lib_libGraphicsMagick___la_DEPENDENCIES) Magick++/lib/$(am__dirstamp) $(Magick___lib_libGraphicsMagick___la_LINK) $(am_Magick___lib_libGraphicsMagick___la_rpath) $(Magick___lib_libGraphicsMagick___la_OBJECTS) $(Magick___lib_libGraphicsMagick___la_LIBADD) $(LIBS) -+Magick++/lib/GraphicsMagick++.dll : Magick++/lib/.libs/libGraphicsMagick++.a ++Magick++/lib/GraphicsMagick++.dll : Magick++/lib/libGraphicsMagick++.la + $(CXX) -shared -o $@ \ + $(LDFLAGS) \ + -Wl,--out-implib=Magick++/lib/libGraphicsMagick++.dll.a \ + -Wl,--output-def=Magick++/lib/libGraphicsMagick++.def \ -+ -Wl,--whole-archive $< \ ++ -Wl,--whole-archive Magick++/lib/.libs/libGraphicsMagick++.a \ + -Wl,--no-whole-archive \ + -L./magick/.libs \ + -lGraphicsMagick \
--- a/admin/Windows/mingw32/graphicsmagick/build-1.3.3-3.sh Thu Jun 18 06:11:14 2009 +0000 +++ b/admin/Windows/mingw32/graphicsmagick/build-1.3.3-3.sh Thu Jun 18 14:47:22 2009 +0000 @@ -62,10 +62,10 @@ } -build() +build_pre() { modify_libtool_all ${BUILDDIR}/libtool - ( cd ${BUILDDIR} && make CXXLIBS="$CXXLIBS" ) + MAKE_FLAGS="$MAKE_FLAGS CXXLIBS=\"$CXXLIBS\"" } TOOLS=""