- Use tcl8.3;
- provide workarround for dlopen()/dlsym() bug in recent CURRENT/STABLE.
This commit is contained in:
parent
784b7d8ad2
commit
836258e41e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=34830
@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= sobomax
|
||||
|
||||
MAINTAINER= 3d@FreeBSD.org
|
||||
|
||||
BUILD_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82 \
|
||||
BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \
|
||||
autoconf:${PORTSDIR}/devel/autoconf \
|
||||
nonexistent:${PORTSDIR}/graphics/Mesa3:patch
|
||||
|
||||
@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-extra \
|
||||
--with-mesa=${WRKDIRPREFIX}${.CURDIR}/../../graphics/Mesa3/work/Mesa-3.2.1 \
|
||||
--sysconfdir=${PREFIX}/etc \
|
||||
--with-moduledir=${PREFIX}/lib/modules
|
||||
CONFIGURE_ENV= TCLSH="tclsh8.2"
|
||||
CONFIGURE_ENV= TCLSH="tclsh8.3"
|
||||
MAKE_ENV= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
|
||||
PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}"
|
||||
|
||||
|
15
graphics/utah-glx/files/patch-ba
Normal file
15
graphics/utah-glx/files/patch-ba
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN libGL/pointers.c libGL/pointers.c
|
||||
--- libGL/pointers.c Wed Jan 26 15:28:36 2000
|
||||
+++ libGL/pointers.c Sun Nov 5 19:21:46 2000
|
||||
@@ -332,9 +332,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bb
Normal file
15
graphics/utah-glx/files/patch-bb
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/common/glx_symbols.c servGL/hwglx/common/glx_symbols.c
|
||||
--- servGL/hwglx/common/glx_symbols.c Wed Mar 22 07:25:59 2000
|
||||
+++ servGL/hwglx/common/glx_symbols.c Sun Nov 5 19:22:23 2000
|
||||
@@ -187,9 +187,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fprintf( stderr, "%s\n", error );
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs( dlerror(), stderr );
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bc
Normal file
15
graphics/utah-glx/files/patch-bc
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/common/x11_symbols.c servGL/hwglx/common/x11_symbols.c
|
||||
--- servGL/hwglx/common/x11_symbols.c Mon Jan 17 09:11:02 2000
|
||||
+++ servGL/hwglx/common/x11_symbols.c Sun Nov 5 19:22:44 2000
|
||||
@@ -92,9 +92,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bd
Normal file
15
graphics/utah-glx/files/patch-bd
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/i810/i810symbols.c servGL/hwglx/i810/i810symbols.c
|
||||
--- servGL/hwglx/i810/i810symbols.c Mon Jan 17 09:11:02 2000
|
||||
+++ servGL/hwglx/i810/i810symbols.c Sun Nov 5 19:17:44 2000
|
||||
@@ -28,9 +28,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-be
Normal file
15
graphics/utah-glx/files/patch-be
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/mga/mgasymbols.c servGL/hwglx/mga/mgasymbols.c
|
||||
--- servGL/hwglx/mga/mgasymbols.c Tue Feb 29 12:40:30 2000
|
||||
+++ servGL/hwglx/mga/mgasymbols.c Sun Nov 5 19:18:33 2000
|
||||
@@ -29,9 +29,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bf
Normal file
15
graphics/utah-glx/files/patch-bf
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/nv/riva_symbols.c servGL/hwglx/nv/riva_symbols.c
|
||||
--- servGL/hwglx/nv/riva_symbols.c Sun Feb 13 22:02:30 2000
|
||||
+++ servGL/hwglx/nv/riva_symbols.c Sun Nov 5 19:19:04 2000
|
||||
@@ -29,9 +29,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
16
graphics/utah-glx/files/patch-bg
Normal file
16
graphics/utah-glx/files/patch-bg
Normal file
@ -0,0 +1,16 @@
|
||||
diff -druN servGL/hwglx/s3savage/s3savglx.c servGL/hwglx/s3savage/s3savglx.c
|
||||
--- servGL/hwglx/s3savage/s3savglx.c Sun Aug 20 08:50:25 2000
|
||||
+++ servGL/hwglx/s3savage/s3savglx.c Sun Nov 5 19:20:54 2000
|
||||
@@ -83,10 +83,9 @@
|
||||
my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
-if ((error = dlerror()) != 0)
|
||||
+ if (tmp == NULL)
|
||||
{
|
||||
- fputs(error, stderr);
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bh
Normal file
15
graphics/utah-glx/files/patch-bh
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/s3virge/s3virgesymbols.c servGL/hwglx/s3virge/s3virgesymbols.c
|
||||
--- servGL/hwglx/s3virge/s3virgesymbols.c Sun Jan 16 03:22:47 2000
|
||||
+++ servGL/hwglx/s3virge/s3virgesymbols.c Sun Nov 5 19:19:36 2000
|
||||
@@ -24,9 +24,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
15
graphics/utah-glx/files/patch-bi
Normal file
15
graphics/utah-glx/files/patch-bi
Normal file
@ -0,0 +1,15 @@
|
||||
diff -druN servGL/hwglx/sis6326/sis6326symbols.c servGL/hwglx/sis6326/sis6326symbols.c
|
||||
--- servGL/hwglx/sis6326/sis6326symbols.c Sun Mar 5 11:10:37 2000
|
||||
+++ servGL/hwglx/sis6326/sis6326symbols.c Sun Nov 5 19:20:00 2000
|
||||
@@ -10,9 +10,8 @@
|
||||
static void *my_dlsym(void *handle, const char *name)
|
||||
{
|
||||
void *tmp = dlsym(handle, name);
|
||||
- char *error;
|
||||
- if ((error = dlerror()) != 0) {
|
||||
- fputs(error, stderr);
|
||||
+ if (tmp == NULL) {
|
||||
+ fputs(dlerror(), stderr);
|
||||
any_error = 1;
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user