Sync libtool, put loaders back into lib; wilfried@ and me.
This commit is contained in:
naddy
parent
b4b5d4b990
commit
17fec09fa4
@ -1,8 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2001/03/27 11:45:07 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2001/04/01 20:18:06 naddy Exp $
|
||||
|
||||
COMMENT= "replacement library for imlib"
|
||||
|
||||
DISTNAME= gdk-pixbuf-0.10.1
|
||||
CATEGORIES= graphics
|
||||
NEED_VERSION= 1.346
|
||||
NEED_VERSION= 1.378
|
||||
MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gdk-pixbuf/
|
||||
|
||||
HOMEPAGE= http://developer.gnome.org/arch/imaging/gdkpixbuf.html
|
||||
@ -21,8 +23,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static --disable-modules
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
|
||||
12
graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am
Normal file
12
graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_Makefile_am
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-gdk-pixbuf_Makefile_am,v 1.1 2001/04/01 20:18:07 naddy Exp $
|
||||
--- gdk-pixbuf/Makefile.am.orig Thu Mar 1 00:05:34 2001
|
||||
+++ gdk-pixbuf/Makefile.am Sat Mar 31 21:39:32 2001
|
||||
@@ -220,7 +220,7 @@ libgdk_pixbuf_xlib_la_SOURCES = \
|
||||
gdk-pixbuf-parse-color.c \
|
||||
$(extra_sources)
|
||||
|
||||
-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
|
||||
+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) $(LIBPNG) $(LIBJPEG) $(LIBTIFF)
|
||||
libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.1 2001/03/27 11:45:11 naddy Exp $
|
||||
--- gdk-pixbuf/Makefile.in.orig Fri Mar 23 13:41:15 2001
|
||||
+++ gdk-pixbuf/Makefile.in Fri Mar 23 13:44:23 2001
|
||||
@@ -416,6 +416,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
|
||||
if test -f $$p; then \
|
||||
echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
|
||||
$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
|
||||
+ echo "$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)"; \
|
||||
+ $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir); \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
52
graphics/gdk-pixbuf/patches/patch-ltconfig
Normal file
52
graphics/gdk-pixbuf/patches/patch-ltconfig
Normal file
@ -0,0 +1,52 @@
|
||||
$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*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1396,10 +1399,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[01234567])
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ 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
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1997,13 +2011,10 @@ netbsd*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
- 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*)
|
||||
84
graphics/gdk-pixbuf/patches/patch-ltmain_sh
Normal file
84
graphics/gdk-pixbuf/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,84 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1 2001/04/01 20:18:07 naddy Exp $
|
||||
--- ltmain.sh.orig Mon Mar 12 01:44:23 2001
|
||||
+++ ltmain.sh Fri Mar 30 12:31:13 2001
|
||||
@@ -1079,7 +1079,18 @@ compiler."
|
||||
# These systems don't actually have c library (as such)
|
||||
continue
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ continue
|
||||
+ ;;
|
||||
esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
elif test "$arg" = "-lm"; then
|
||||
case "$host" in
|
||||
*-*-cygwin* | *-*-beos*)
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
deplibs="$deplibs $arg"
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1795,6 +1810,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -1 +0,0 @@
|
||||
replacement library for imlib
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2001/03/27 11:45:12 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2001/04/01 20:18:07 naddy Exp $
|
||||
bin/gdk-pixbuf-config
|
||||
include/gdk-pixbuf/gdk-pixbuf-features.h
|
||||
include/gdk-pixbuf/gdk-pixbuf-loader.h
|
||||
@ -58,7 +58,5 @@ share/html/gdk-pixbuf/x3765.html
|
||||
share/html/gdk-pixbuf/x3787.html
|
||||
@dirrm share/html/gdk-pixbuf
|
||||
@dirrm share/html
|
||||
@exec mkdir -p %D/lib/gdk-pixbuf/loaders
|
||||
@dirrm lib/gdk-pixbuf/loaders
|
||||
@dirrm lib/gdk-pixbuf
|
||||
@dirrm include/gdk-pixbuf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user