Date: Sat, 21 Sep 2002 17:49:10 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: KATO Tsuguru <tkato@prontomail.com> Subject: ports/43153: [patch] unbreak graphics/imlib2 Message-ID: <20020921074910.708F66A7124@k7.mavetju>
next in thread | raw e-mail | index | archive | help
>Number: 43153
>Category: ports
>Synopsis: [patch] unbreak graphics/imlib2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 21 01:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386
>Description:
With the last upgrade of graphics/imlib2 I got an error while compiling it:
cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/X11R6/include -I/usr/X11R6/include -I/usr/X11R6/include -I/usr/X11R6/include -I. -I.. -I../src -I../loaders -I/usr/local/include/freetype1 -I/usr/local/include -O -pipe -march=pentiumpro -c scale.c -fPIC -DPIC -o .libs/scale.lo
In file included from colormod.h:12,
from scale.c:2:
image.h:9: ltdl.h: No such file or directory
In file included from colormod.h:12,
from scale.c:2:
image.h:117: syntax error before `lt_dlhandle'
ltdl.h is part of libtool, but imlib2 doesn't want the "standard"
libtool but has its own (see line 1822 of configure).
>How-To-Repeat:
>Fix:
The patch in files/patch-src::Makefile.in explicitely removes every
reference toimlib2/libltdl. Putting these back will solve the
problem, but unfortunatly I don't know how good this approach is
regarding breakage of other programs/shared libs/include files.
An other approach is to let the Makefile point to
/usr/local/share/libtool/libltdl/, the place where devel/libtool
put its ltdl.h. Same story here, I don't know what will be broken
in imlib2 by this approach.
What is wisdom in this case?
--- files/old-src::Makefile.in Sat Sep 21 17:38:02 2002
+++ files/patch-src::Makefile.in Sat Sep 21 17:39:43 2002
@@ -5,7 +5,7 @@
LDFLAGS = -L/usr/X11R6/lib
-INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders
-+INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders
++INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders
MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S asm_blend_cmod.S
@@ -20,67 +20,3 @@
@HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
@HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
-@@ -283,48 +283,48 @@
- fi; \
- done
- api.lo api.o : api.c ../config.h common.h colormod.h image.h \
-- ../libltdl/ltdl.h scale.h blend.h context.h color.h grab.h \
-+ scale.h blend.h context.h color.h grab.h \
- rend.h rgba.h ximage.h draw.h file.h updates.h rgbadraw.h \
- Imlib2.h font.h grad.h rotate.h filter.h dynamic_filters.h \
- script.h color_helpers.h
- blend.lo blend.o : blend.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h blend.h scale.h
-+ blend.h scale.h
- color.lo color.o : color.c common.h ../config.h color.h
- color_helpers.lo color_helpers.o : color_helpers.c color_helpers.h
- colormod.lo colormod.o : colormod.c common.h ../config.h colormod.h \
-- image.h ../libltdl/ltdl.h file.h loaderpath.h blend.h
-+ image.h file.h loaderpath.h blend.h
- context.lo context.o : context.c common.h ../config.h image.h \
-- ../libltdl/ltdl.h context.h color.h rgba.h
-+ context.h color.h rgba.h
- draw.lo draw.o : draw.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h blend.h rend.h draw.h
-+ blend.h rend.h draw.h
- dynamic_filters.lo dynamic_filters.o : dynamic_filters.c common.h \
-- ../config.h image.h ../libltdl/ltdl.h file.h dynamic_filters.h \
-+ ../config.h image.h file.h dynamic_filters.h \
- script.h Imlib2.h loaderpath.h
- file.lo file.o : file.c common.h ../config.h file.h
- filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h blend.h filter.h
-+ blend.h filter.h
- font.lo font.o : font.c ../config.h common.h colormod.h image.h \
-- ../libltdl/ltdl.h blend.h font.h file.h updates.h rgbadraw.h \
-+ blend.h font.h file.h updates.h rgbadraw.h \
- rotate.h
- format.lo format.o : format.c format.h
- grab.lo grab.o : grab.c common.h ../config.h grab.h
- grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h file.h loaderpath.h blend.h grad.h \
-+ file.h loaderpath.h blend.h grad.h \
- color_helpers.h
- image.lo image.o : image.c common.h ../config.h image.h \
-- ../libltdl/ltdl.h file.h loaderpath.h
-+ file.h loaderpath.h
- rend.lo rend.o : rend.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h scale.h ximage.h context.h rgba.h color.h \
-+ scale.h ximage.h context.h rgba.h color.h \
- grab.h blend.h rend.h rotate.h
- rgba.lo rgba.o : rgba.c common.h ../config.h context.h rgba.h
- rgbadraw.lo rgbadraw.o : rgbadraw.c common.h ../config.h colormod.h \
-- image.h ../libltdl/ltdl.h scale.h blend.h updates.h rgbadraw.h
-+ image.h scale.h blend.h updates.h rgbadraw.h
- rotate.lo rotate.o : rotate.c common.h ../config.h rotate.h image.h \
-- ../libltdl/ltdl.h colormod.h blend.h
-+ colormod.h blend.h
- scale.lo scale.o : scale.c common.h ../config.h colormod.h image.h \
-- ../libltdl/ltdl.h blend.h scale.h
-+ blend.h scale.h
- script.lo script.o : script.c common.h ../config.h Imlib2.h image.h \
-- ../libltdl/ltdl.h file.h dynamic_filters.h script.h \
-+ file.h dynamic_filters.h script.h \
- loaderpath.h
- updates.lo updates.o : updates.c common.h ../config.h updates.h
- ximage.lo ximage.o : ximage.c common.h ../config.h ximage.h
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020921074910.708F66A7124>