- use MASTER_SITE_GNOME

- remove redundant dependency entry
- sync libtool patch
This commit is contained in:
brad 2001-09-01 02:33:59 +00:00
parent 7c68aafe81
commit 806b61a1fd
2 changed files with 48 additions and 19 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.4 2001/05/24 02:27:53 kevlo Exp $
# $OpenBSD: Makefile,v 1.5 2001/09/01 02:33:59 brad Exp $
COMMENT= "replacement library for imlib"
COMMENT= "replacement library for Imlib"
DISTNAME= gdk-pixbuf-0.10.1
CATEGORIES= graphics
NEED_VERSION= 1.378
MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gdk-pixbuf/
NEED_VERSION= 1.435
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf
HOMEPAGE= http://developer.gnome.org/arch/imaging/gdkpixbuf.html
LIB_DEPENDS= png.2::graphics/png \
jpeg.62::graphics/jpeg \
tiff.35.::graphics/tiff \
gtk.1.2::x11/gtk+

View File

@ -1,17 +1,34 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/04/01 20:18:07 naddy Exp $
--- ltconfig.orig Mon Mar 12 01:44:23 2001
+++ ltconfig Fri Mar 30 12:31:05 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
$OpenBSD: patch-ltconfig,v 1.2 2001/09/01 02:33:59 brad Exp $
--- ltconfig.orig Thu Apr 26 19:41:43 2001
+++ ltconfig Fri Aug 31 18:41:44 2001
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1396,10 +1399,21 @@ else
ld_shlibs=yes
@@ -1396,10 +1405,21 @@ else
;;
openbsd*)
@ -27,7 +44,7 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/04/01 20:18:07 naddy Exp $
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
@ -35,18 +52,30 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/04/01 20:18:07 naddy Exp $
;;
os2*)
@@ -1997,13 +2011,10 @@ netbsd*)
@@ -1997,9 +2017,23 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)