- disable building of esd/arts plugins in accordance with respective flavors
- sync libtool patches
This commit is contained in:
naddy
parent
4dd87cc75b
commit
c41c1392fd
@ -1,14 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2001/07/26 12:31:32 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2001/08/09 15:07:31 naddy Exp $
|
||||
|
||||
COMMENT= "portable audio output library"
|
||||
COMMENT-arts= "aRts module for portable audio output library"
|
||||
COMMENT-esd= "ESounD module for portable audio output library"
|
||||
|
||||
VERSION= 0.7.0
|
||||
DISTNAME= libao-${VERSION}
|
||||
FULLPKGNAME= libao-${VERSION}
|
||||
FULLPKGNAME-arts= libao-arts-${VERSION}
|
||||
FULLPKGNAME-esd= libao-esd-${VERSION}
|
||||
|
||||
VERSION= 0.7.0
|
||||
DISTNAME= libao-${VERSION}
|
||||
CATEGORIES= audio
|
||||
NEED_VERSION= 1.422
|
||||
HOMEPAGE= http://www.vorbis.com/
|
||||
@ -37,6 +38,12 @@ SUBPACKAGE?=
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
|
||||
.if ${FLAVOR:L:Mno_arts}
|
||||
CONFIGURE_ARGS+= --disable-arts
|
||||
.endif
|
||||
.if ${FLAVOR:L:Mno_esd}
|
||||
CONFIGURE_ARGS+= --disable-esd
|
||||
.endif
|
||||
|
||||
.if defined(PACKAGING)
|
||||
. if ${SUBPACKAGE} == "-arts"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-ltconfig,v 1.2 2001/07/22 00:12:55 naddy Exp $
|
||||
$OpenBSD: patch-ltconfig,v 1.3 2001/08/09 15:07:31 naddy Exp $
|
||||
--- ltconfig.orig Thu Jul 13 23:54:59 2000
|
||||
+++ ltconfig Fri Jul 20 22:27:14 2001
|
||||
+++ ltconfig Thu Aug 9 16:53:03 2001
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
@ -27,27 +27,31 @@ $OpenBSD: patch-ltconfig,v 1.2 2001/07/22 00:12:55 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
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -2021,13 +2035,11 @@ netbsd*)
|
||||
@@ -2021,9 +2035,16 @@ 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__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ 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*)
|
||||
|
||||
@ -1,46 +1,45 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/03/14 01:54:09 todd Exp $
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2001/08/09 15:07:31 naddy Exp $
|
||||
--- ltmain.sh.orig Thu Jul 13 23:54:59 2000
|
||||
+++ ltmain.sh Mon Mar 12 19:59:25 2001
|
||||
@@ -1079,7 +1079,18 @@ compiler."
|
||||
+++ ltmain.sh Thu Aug 9 16:53:15 2001
|
||||
@@ -1079,6 +1079,17 @@ 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
|
||||
+ ;;
|
||||
+ *-*-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" = "-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"
|
||||
+ ;;
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1799,6 +1814,9 @@ compiler."
|
||||
# rhapsody is a little odd...
|
||||
deplibs="$deplibs -framework System"
|
||||
@@ -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.
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
*-*-rhapsody*)
|
||||
# rhapsody is a little odd...
|
||||
deplibs="$deplibs -framework System"
|
||||
@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user