SPECS: ImageMagick.spec - updated to 6.1.0-8 - libpath and system-...

[Jakub Bogusz]

On Wed, Oct 13, 2004 at 08:39:57PM +0200, Marcin Król wrote:
> >Author: hawk                         Date: Wed Oct 13 18:10:41 2004 GMT
> >Module: SPECS                         Tag: HEAD
> >---- Log message:
> >- libpath and system-libltdl patches seems to be obsolete now
> 
> I'm not sure about this. Someone may check this?

I've prepared IM 6.0.8-1 in mid September, but finally forgot to commit
it. Both patches were still needed, but needed an update. See
attachments.
I haven't seen 6.1.0 yet (BTW, isn't 6.1.0-8 some prerelease before
6.1.1? IIRC only *-1 are releases, the rest are pre*/betas/wtfs).

> I don't know if it 
> links against system libltdl or its own libltdl, sonames are identical 
> and it runs on both of them.

...until libMagick is linked with something which uses system (or its
own) libltdl - then strange things happen and process is most likely to
crash.
The only solution is to use only system libltdl in all libraries and
those apps, which possibly use libraries linked with libltdl.


-- 
Jakub Bogusz    http://cyber.cs.net.pl/~qboosh/
-------------- next part --------------
--- ImageMagick-5.5.7/configure.ac.orig	2003-05-31 16:41:34.000000000 +0200
+++ ImageMagick-5.5.7/configure.ac	2003-07-18 08:27:51.000000000 +0200
@@ -2194,7 +2194,7 @@
 # Determine path to pick up ImageMagick library from for use with building PerlMagick
 MAGICKLIBDIR="${LIB_DIR}"
 MAGICKLIB="-L${MAGICKLIBDIR} -lMagick"
-if test $with_perl_static = 'yes'
+if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes'
 then
   # Find out where libtool hides its uninstalled libraries (as libtool_objdir)
   eval `./libtool --config|grep '^objdir='|sed -e 's/^objdir/libtool_objdir/'`
--- ImageMagick-6.0.8/PerlMagick/Makefile.am.orig	2004-09-12 19:25:25.000000000 +0200
+++ ImageMagick-6.0.8/PerlMagick/Makefile.am	2004-09-19 12:25:10.924398496 +0200
@@ -45,11 +45,12 @@
 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
 
 install-exec-perl: $(PERLMAKEFILE)
-	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+	( cd $(PERLMAGICK) && \
 	$(MAKE) CC='@CC@' install && \
 	$(MAKE) clean && rm -f  Makefile.old )
 
-all-perl:
+all-perl: $(PERLMAKEFILE) magick/libMagick.la
+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
 
 uninstall-exec-perl: $(PERLMAKEFILE)
 	echo "Uninstall not supported for PerlMagick"
-------------- next part --------------
--- ImageMagick-5.5.1/configure.ac.orig	Fri Nov  1 14:37:40 2002
+++ ImageMagick-5.5.1/configure.ac	Fri Nov  1 14:41:30 2002
@@ -148,7 +148,7 @@
 
 # Configure libltdl
 #AC_CONFIG_SUBDIRS(ltdl)
-AC_LIBLTDL_CONVENIENCE(ltdl)
+AC_LIBLTDL_INSTALLABLE(ltdl)
 AC_LIB_LTDL
 # Substitute INCLTDL and LIBLTDL in the Makefiles
 AC_SUBST(INCLTDL)
--- ImageMagick-6.0.8/ltdl/Makefile.am.orig	2004-09-19 12:48:06.763239000 +0200
+++ ImageMagick-6.0.8/ltdl/Makefile.am	2004-09-19 13:35:40.529400800 +0200
@@ -28,12 +28,8 @@
 #endif
 
 if WITH_LTDL
-  LIBLTDL=ltdl/libltdl.la
-if INSTALL_LTDL
-  LTDL_INSTALLHEADERS =  $(LTDL_HDRS)
-else
+  LIBLTDL=-lltdl
   LTDL_NOINST_HDRS = $(LTDL_HDRS)
-endif # INSTALL_LTDL
 else
   LIBLTDL=
 endif # WITH_LTDL
--- ImageMagick-6.0.8/Makefile.am.orig	2004-09-19 12:48:16.518756000 +0200
+++ ImageMagick-6.0.8/Makefile.am	2004-09-19 13:36:41.366152208 +0200
@@ -19,7 +19,7 @@
 
 topincludedir = @includedir@
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/ltdl -I$(top_srcdir) -I$(top_srcdir)/Magick++/lib -I$(top_srcdir)/ltdl
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/Magick++/lib
 
 MODULECOMMONFLAGS = -no-undefined -module -avoid-version
 
@@ -112,7 +112,7 @@
 	$(UTILITIES_EXTRA_DIST) \
 	$(WAND_EXTRA_DIST)
 
-lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
+lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
 
 check_PROGRAMS = \
 	$(TESTS_CHECK_PGRMS) \