cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-li386 needed on x86 for win32 flavor; from biorn@dce.chalmers.se

Browse Source
This commit is contained in:
pvalchev 2002-05-14 03:05:31 +00:00
parent 46df1cbbcf
commit d3cdf7c80a
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
x11/mplayer/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.4 2002/05/12 18:50:46 niklas Exp $ $OpenBSD: patch-configure,v 1.5 2002/05/14 03:05:31 pvalchev Exp $
--- configure.orig Sat May 4 00:13:06 2002 --- configure.orig Sat May 4 00:13:06 2002
+++ configure Sun May 12 20:08:33 2002 +++ configure Mon May 13 19:44:26 2002
@@ -1390,8 +1390,8 @@ if test "$_malloc" = yes ; then @@ -1390,8 +1390,8 @@ if test "$_malloc" = yes ; then
else else
_def_malloc='#undef HAVE_MALLOC_H' _def_malloc='#undef HAVE_MALLOC_H'
@ -21,21 +21,28 @@ $OpenBSD: patch-configure,v 1.4 2002/05/12 18:50:46 niklas Exp $
echocheck "soundcard.h" echocheck "soundcard.h"
cat > $TMPC << EOF cat > $TMPC << EOF
#include <soundcard.h> #include <soundcard.h>
@@ -3522,8 +3522,11 @@ test "$_xanim" = yes && _ld_dl_dynamic=' @@ -2500,6 +2500,7 @@ if test "$_ossaudio" = yes ; then
else
if netbsd || openbsd ; then
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
+ _ld_arch="$_ld_arch -lossaudio"
else
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
fi
@@ -3522,8 +3523,10 @@ test "$_xanim" = yes && _ld_dl_dynamic='
_ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic" _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
bsdos && _ld_arch="$_ld_arch -ldvd" bsdos && _ld_arch="$_ld_arch -ldvd"
-netbsd && _ld_arch="$_ld_arch -li386 -lossaudio" -netbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
-openbsd && _ld_arch="$_ld_arch -li386 -lossaudio" -openbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
+ +
+if netbsd ; then +if netbsd || openbsd ; then
+ _ld_arch="$_ld_arch -lossaudio"
+ x86 && _ld_arch="$_ld_arch -li386" + x86 && _ld_arch="$_ld_arch -li386"
+fi +fi
_def_debug='#undef MP_DEBUG' _def_debug='#undef MP_DEBUG'
test "$_debug" && _def_debug='#define MP_DEBUG 1' test "$_debug" && _def_debug='#define MP_DEBUG 1'
@@ -3590,11 +3593,11 @@ cat > config.mak << EOF @@ -3590,11 +3593,10 @@ cat > config.mak << EOF
LANG = C LANG = C
TARGET_OS = $system_name TARGET_OS = $system_name
@ -44,7 +51,6 @@ $OpenBSD: patch-configure,v 1.4 2002/05/12 18:50:46 niklas Exp $
-CONFDIR = $_confdir -CONFDIR = $_confdir
-LIBDIR = $_libdir -LIBDIR = $_libdir
-AR = ar -AR = ar
+TARGET_ARCH = $host_arch
+prefix = \$(DESTDIR)$_prefix +prefix = \$(DESTDIR)$_prefix
+DATADIR = \$(DESTDIR)$_datadir +DATADIR = \$(DESTDIR)$_datadir
+CONFDIR = \$(DESTDIR)$_confdir +CONFDIR = \$(DESTDIR)$_confdir

8
x11/mplayer/patches/patch-libdha_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libdha_Makefile,v 1.3 2002/05/12 08:16:24 pvalchev Exp $ $OpenBSD: patch-libdha_Makefile,v 1.4 2002/05/14 03:05:31 pvalchev Exp $
--- libdha/Makefile.orig Sat Feb 2 05:14:56 2002 --- libdha/Makefile.orig Sat Feb 2 13:14:56 2002
+++ libdha/Makefile Sun May 12 01:38:39 2002 +++ libdha/Makefile Mon May 13 19:29:51 2002
@@ -7,27 +7,36 @@ VERSION = 0.1 @@ -7,27 +7,36 @@ VERSION = 0.1
ifeq ($(TARGET_OS),CYGWIN) ifeq ($(TARGET_OS),CYGWIN)
SHORTNAME = libdha.dll SHORTNAME = libdha.dll
@ -20,7 +20,7 @@ $OpenBSD: patch-libdha_Makefile,v 1.3 2002/05/12 08:16:24 pvalchev Exp $
CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W
+LIBS = +LIBS =
+ifeq ($(TARGET_OS),OpenBSD) +ifeq ($(TARGET_OS),OpenBSD)
+ifeq ($(TARGET_ARCH),i386) +ifeq ($(TARGET_ARCH_X86),yes)
+LIBS += -li386 +LIBS += -li386
+endif +endif
+endif +endif