SHARED_LIBS

USE_LIBTOOL

LIBTOOL_FLAGS hint and OK espie@
This commit is contained in:
jakemsr 2006-01-08 23:48:36 +00:00
parent 0b15dfafd0
commit 456d321fc3
5 changed files with 8 additions and 127 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2005/02/09 23:41:43 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2006/01/08 23:48:36 jakemsr Exp $
# $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
SHARED_ONLY= Yes
@ -7,6 +7,7 @@ COMMENT= library for reading and writing quicktime files
DISTNAME= libquicktime-0.9.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
SHARED_LIBS= quicktime 1.0
HOMEPAGE= http://libquicktime.sourceforge.net/
@ -31,6 +32,8 @@ LIB_DEPENDS= vorbis.3,vorbisfile.4,vorbisenc.2::audio/libvorbis \
avcodec.4::graphics/ffmpeg
USE_GMAKE= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
VMEM_WARNING= Yes
CONFIGURE_STYLE= gnu

View File

@ -1,43 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2005/02/09 23:41:43 naddy Exp $
$OpenBSD: patch-configure,v 1.4 2006/01/08 23:48:37 jakemsr Exp $
--- configure.orig Mon Jul 19 11:57:49 2004
+++ configure Mon Aug 9 03:17:56 2004
@@ -3500,12 +3500,10 @@ nto-qnx)
;;
openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
fi
;;
@@ -10040,6 +10038,21 @@ if test -z "$aix_libpath"; then aix_libp
# 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
+ ld_shlibs=no
+ ;;
+ openbsd*)
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_direct_CXX=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ ;;
osf3*)
case $cc_basename in
KCC)
@@ -19822,11 +19835,11 @@ ASFLAGS=

View File

@ -1,76 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2004/12/04 21:44:34 sturm Exp $
--- ltmain.sh.orig Mon Jul 19 11:57:44 2004
+++ ltmain.sh Mon Aug 9 03:09:03 2004
@@ -1354,6 +1354,17 @@ EOF
-o) prev=output ;;
+ -pthread)
+ case $host in
+ *-*-openbsd* | *-*-freebsd*)
+ # These systems use the -pthread flag for pthreads.
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+ esac
+ continue
+ ;;
+
-release)
prev=release
continue
@@ -1898,6 +1909,22 @@ EOF
esac # linkmode
continue
;; # -L
+ -pthread)
+ case $host in
+ *-*-openbsd* | *-*-freebsd*)
+ # These systems use the -pthread flag for pthreads.
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ ;;
+ esac
+ continue
+ ;;
-R*)
if test "$pass" = link; then
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
@@ -1918,7 +1945,21 @@ EOF
fi
case $linkmode in
lib)
- if test "$deplibs_check_method" != pass_all; then
+ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ if eval $echo \"$deplib\" 2>/dev/null \
+ | ${SED} 10q \
+ | ${EGREP} "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+ valid_a_lib=yes
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
$echo
$echo "*** Warning: Trying to link with static lib archive $deplib."
$echo "*** I have the capability to make that library automatically link in when"
@@ -2403,7 +2444,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"

View File

@ -1,15 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2005/02/09 23:41:43 naddy Exp $
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/01/08 23:48:37 jakemsr Exp $
--- src/Makefile.in.orig Mon Jul 19 11:57:53 2004
+++ src/Makefile.in Thu Jan 27 21:27:58 2005
@@ -211,7 +211,7 @@ lib_LTLIBRARIES = libquicktime.la
# Library dependencies are emtpy no
# Maybe we need zlib to read compressed quicktime headers
#
-libquicktime_la_LDFLAGS = -export-dynamic
+libquicktime_la_LDFLAGS = -export-dynamic -version-info 1:0:0
@HAVE_FSEEKO_FALSE@FSEEKO_SRC = lqt_fseeko.c
@@ -392,7 +392,7 @@ clean-libLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2004/12/04 21:44:35 sturm Exp $
@comment $OpenBSD: PLIST,v 1.4 2006/01/08 23:48:37 jakemsr Exp $
bin/libquicktime_config
bin/lqt-config
bin/lqt_transcode
@ -20,7 +20,7 @@ include/quicktime/qtprivate.h
include/quicktime/quicktime.h
lib/libquicktime/
lib/libquicktime.la
@lib lib/libquicktime.so.1.0
@lib lib/libquicktime.so.${LIBquicktime_VERSION}
@comment lib/libquicktime/lqt_audiocodec.la
lib/libquicktime/lqt_audiocodec.so
@comment lib/libquicktime/lqt_dv.la