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

do not pick up libtool on the way.

Browse Source 
okay pval@
This commit is contained in:
espie 2003-12-07 19:45:42 +00:00
parent d9e8aae7b4
commit e3125a817b
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/sdl/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.28 2003/09/29 05:41:37 pvalchev Exp $
# $OpenBSD: Makefile,v 1.29 2003/12/07 19:45:42 espie Exp $
# Uses pthreads
COMMENT= "cross-platform multimedia library"
VERSION= 1.2.6
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}
PKGNAME= ${DISTNAME:L}p0
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
@ -32,6 +32,7 @@ CONFIGURE_ENV+= X11BASE="${X11BASE}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-oss \
--disable-ltdl \
--enable-pthread-sem
# XXX gcc 3/nasm issue.

47
devel/sdl/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.21 2003/09/29 05:41:37 pvalchev Exp $
$OpenBSD: patch-configure_in,v 1.22 2003/12/07 19:45:43 espie Exp $
--- configure.in.orig 2003-08-30 21:13:18.000000000 +0200
+++ configure.in 2003-09-21 14:43:28.000000000 +0200
+++ configure.in 2003-12-07 19:43:19.000000000 +0100
@@ -492,9 +492,6 @@ CheckNASM()
win32)
NASMFLAGS="-f win32"
@ -11,7 +11,46 @@ $OpenBSD: patch-configure_in,v 1.21 2003/09/29 05:41:37 pvalchev Exp $
*)
NASMFLAGS="-f elf"
;;
@@ -2549,6 +2546,9 @@ fi
@@ -1030,9 +1027,6 @@ CheckOpenGL()
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
- if test x$use_dlopen != xyes; then
- AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
- fi
fi
fi
}
@@ -1053,9 +1047,6 @@ CheckOpenGLQNX()
if test x$video_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
SYSTEM_LIBS="$SYSTEM_LIBS -lGL"
- if test x$use_dlopen != xyes; then
- AC_CHECK_LIB(c, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS", AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
- fi
fi
fi
}
@@ -1559,6 +1550,9 @@ CheckDLOPEN()
AC_ARG_ENABLE(dlopen,
[ --enable-dlopen use dlopen for shared object loading [default=no]],
, enable_dlopen=yes)
+ AC_ARG_ENABLE(ltdl,
+[ --enable-ltdl use libtool for shared object loading [default=no]],
+ , enable_ltdl=yes)
if test x$enable_dlopen = xyes; then
AC_MSG_CHECKING(for dlopen)
use_dlopen=no
@@ -1570,7 +1564,7 @@ CheckDLOPEN()
])
AC_MSG_RESULT($use_dlopen)
- if test x$use_dlopen = xyes; then
+ if test x$use_dlopen = xyes -a x$enable_ltdl = xyes; then
CFLAGS="$CFLAGS -DUSE_DLOPEN"
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl", AC_CHECK_LIB(ltdl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -lltdl"))
fi
@@ -2549,6 +2543,9 @@ fi
if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
fi
@ -21,7 +60,7 @@ $OpenBSD: patch-configure_in,v 1.21 2003/09/29 05:41:37 pvalchev Exp $
case "$ARCH" in
openbsd | netbsd | bsdi)
@@ -2571,7 +2571,7 @@ esac
@@ -2571,7 +2568,7 @@ esac
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
dnl Output the video drivers we use