- forcefully disable MMX on non-i386 systems, gets rid of the silly Linux message since
MMX cannot be automatically detected anyway. - remove libtool patch. - remove bogus @DLLDFLAGS@ from src/Makefile as this trips up newer libtool.
This commit is contained in:
brad
parent
34fb5420f0
commit
9bc7e0c6cf
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2005/12/26 14:35:52 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2006/01/06 21:57:00 brad Exp $
|
||||
|
||||
COMMENT= "image manipulation library"
|
||||
|
||||
DISTNAME= imlib2-1.1.2
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
SHARED_LIBS= Imlib2 2.2
|
||||
MODGNU_SHARED_LIBS= Imlib2 ''
|
||||
CATEGORIES= graphics
|
||||
@ -38,6 +38,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
|
||||
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
CONFIGURE_ARGS+= --enable-mmx
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-mmx
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2004/09/21 22:40:36 brad Exp $
|
||||
--- aclocal.m4.orig Tue Aug 24 21:26:00 2004
|
||||
+++ aclocal.m4 Tue Aug 24 21:30:17 2004
|
||||
@@ -1748,6 +1748,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
+ netbsd* | freebsd* | openbsd* | darwin* )
|
||||
+ # This has been around since 386BSD, at least. Likely further.
|
||||
+ if test -x /sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
+ elif test -x /usr/sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
+ else
|
||||
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
+ fi
|
||||
+ # And add a safety zone
|
||||
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -2590,7 +2603,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -4275,6 +4288,22 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ openbsd2*)
|
||||
+ # C++ shared libraries are fairly broken
|
||||
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
+ ;;
|
||||
+ openbsd*)
|
||||
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
|
||||
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -6639,6 +6668,7 @@ $echo "local: *; };" >> $output_objdir/$
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
else
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2004/09/21 22:40:36 brad Exp $
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/06 21:57:00 brad Exp $
|
||||
--- src/Makefile.in.orig Mon Aug 30 23:23:10 2004
|
||||
+++ src/Makefile.in Sun Sep 19 05:26:22 2004
|
||||
+++ src/Makefile.in Fri Jan 6 16:00:32 2006
|
||||
@@ -114,7 +114,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
|
||||
# A list of all the files in the current directory which can be regenerated
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
@ -10,3 +10,14 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2004/09/21 22:40:36 brad Exp $
|
||||
INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/loaders $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @XMISS@
|
||||
|
||||
MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S asm_blend_cmod.S
|
||||
@@ -129,8 +129,8 @@ libImlib2_la_SOURCES = scale.c image.c b
|
||||
EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c context.c color.h context.h draw.h grab.h rend.h rgba.h ximage.h $(MMX_SRCS)
|
||||
|
||||
libImlib2_la_LDFLAGS = -version-info 2:2:1
|
||||
-@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
|
||||
-@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
|
||||
+@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) $(MMX_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
|
||||
+@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) -lltdl $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
|
||||
@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)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user