tags 286674 +patch
thanks
The attached patch to 'openscenegraph' fixes the FTBFS on amd64
by installing things in 'lib' instead of 'lib64'.
The patch also fixes a FTBFS bug with gcc-4.0 by adding 'template <>'
in a few places.
Regards
Andreas Jochens
diff -urN ../tmp-orig/openscenegraph-0.9.8/OpenSceneGraph/Make/makedefs
./OpenSceneGraph/Make/makedefs
--- ../tmp-orig/openscenegraph-0.9.8/OpenSceneGraph/Make/makedefs
2004-12-05 01:03:43.000000000 +0100
+++ ./OpenSceneGraph/Make/makedefs 2005-02-03 19:22:24.964518992 +0100
@@ -162,7 +162,7 @@
ARCH = 32
ifeq ($(ARCH),64)
ARCHARGS = -m64 -DARCH64
- ARCHINST = 64
+ ARCHINST =
else
ARCHARGS =
endif
@@ -184,7 +184,7 @@
ARCH = 32
ifeq ($(ARCH),64)
ARCHARGS = -xarch=v9 -DARCH64
- ARCHINST = 64
+ ARCHINST =
else
ARCHARGS =
ARCHINST =
@@ -244,15 +244,15 @@
ARCH = 32
ifeq ($(ARCH),64)
ARCHARGS = -64 -DARCH64
- ARCHINST = 64
- LINKARGS += -L/usr/freeware/lib64
- PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath
/usr/lib64/libpfdb \
+ ARCHINST =
+ LINKARGS += -L/usr/freeware/lib
+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath
/usr/lib/libpfdb \
$(PFLIBS)
else
ARCHARGS = -n32
ARCHINST = 32
- LINKARGS += -L/usr/freeware/lib32
- PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath
/usr/lib32/libpfdb \
+ LINKARGS += -L/usr/freeware/lib
+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath
/usr/lib32/libpfdb \
$(PFLIBS)
endif
else
@@ -273,15 +273,15 @@
ARCH = 32
ifeq ($(ARCH),64)
ARCHARGS = -mabi=64 -mips4 -DARCH64
- ARCHINST = 64
- LINKARGS += -L/usr/freeware/lib64
- PF_XTRA_LIBS = -L/usr/lib64/libpfdb -rpath
/usr/lib64/libpfdb \
+ ARCHINST =
+ LINKARGS += -L/usr/freeware/lib
+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath
/usr/lib/libpfdb \
$(PFLIBS)
else
ARCHARGS = -mabi=n32 -mips4
- ARCHINST = 32
- LINKARGS += -L/usr/freeware/lib32
- PF_XTRA_LIBS = -L/usr/lib32/libpfdb -rpath
/usr/lib32/libpfdb \
+ ARCHINST =
+ LINKARGS += -L/usr/freeware/lib
+ PF_XTRA_LIBS = -L/usr/lib/libpfdb -rpath
/usr/lib/libpfdb \
$(PFLIBS)
endif
endif
@@ -354,7 +354,7 @@
ifeq ($(SYSARCH),x86_64)
ARCHARGS =
ARCH = 64
- ARCHINST = 64
+ ARCHINST =
else
ARCHARGS =
ARCH = 32
@@ -364,7 +364,7 @@
SHARED = -shared
ifeq ($(SYSARCH),x86_64)
- LINKARGS = -L/usr/X11R6/lib64
+ LINKARGS = -L/usr/X11R6/lib
else
LINKARGS = -L/usr/X11R6/lib
endif
@@ -625,7 +625,7 @@
ifeq ($(ARCH),64)
# not yet tested
ARCHARGS = -march=2.0 -DARCH64
- ARCHINST = 64
+ ARCHINST =
else
# at least my gcc 3.1 defaults to HP-PA RISC 1.1
ARCHARGS =
diff -urN ../tmp-orig/openscenegraph-0.9.8/OpenThreads/Make/makedefs
./OpenThreads/Make/makedefs
--- ../tmp-orig/openscenegraph-0.9.8/OpenThreads/Make/makedefs 2004-11-20
11:13:19.000000000 +0100
+++ ./OpenThreads/Make/makedefs 2005-02-03 14:40:32.000000000 +0100
@@ -244,7 +244,7 @@
SHARED = -shared
ARCHARGS =
ifeq ($(SYSARCH),x86_64)
- LINKARGS = -L/usr/X11R6/lib64
+ LINKARGS = -L/usr/X11R6/lib
else
LINKARGS = -L/usr/X11R6/lib
endif
diff -urN ../tmp-orig/openscenegraph-0.9.8/Producer/Make/makedefs
./Producer/Make/makedefs
--- ../tmp-orig/openscenegraph-0.9.8/Producer/Make/makedefs 2004-12-05
01:10:22.000000000 +0100
+++ ./Producer/Make/makedefs 2005-02-03 14:40:45.000000000 +0100
@@ -271,7 +271,7 @@
SHARED = -shared
ARCHARGS =
ifeq ($(SYSARCH),x86_64)
- LINKARGS = -L/usr/X11R6/lib64
+ LINKARGS = -L/usr/X11R6/lib
else
LINKARGS = -L/usr/X11R6/lib
endif
diff -urN
../tmp-orig/openscenegraph-0.9.8/OpenSceneGraph/src/osgGL2/UniformValue.cpp
./OpenSceneGraph/src/osgGL2/UniformValue.cpp
--- ../tmp-orig/openscenegraph-0.9.8/OpenSceneGraph/src/osgGL2/UniformValue.cpp
2004-07-28 21:56:22.000000000 +0200
+++ ./OpenSceneGraph/src/osgGL2/UniformValue.cpp 2005-02-03
15:24:10.000000000 +0100
@@ -45,9 +45,7 @@
///////////////////////////////////////////////////////////////////////////
-#ifdef sgi
template <>
-#endif
void UniformValue_int::apply( Extensions *ext, const GLhandleARB progObj )
const
{
int loc = getLocation( ext, progObj );
@@ -57,9 +55,7 @@
}
}
-#ifdef sgi
template <>
-#endif
void UniformValue_float::apply( Extensions *ext, const GLhandleARB progObj )
const
{
int loc = getLocation( ext, progObj );
@@ -69,9 +65,7 @@
}
}
-#ifdef sgi
template <>
-#endif
void UniformValue_Vec2::apply( Extensions *ext, const GLhandleARB progObj )
const
{
int loc = getLocation( ext, progObj );
@@ -81,9 +75,7 @@
}
}
-#ifdef sgi
template <>
-#endif
void UniformValue_Vec3::apply( Extensions *ext, const GLhandleARB progObj )
const
{
int loc = getLocation( ext, progObj );
@@ -93,9 +85,7 @@
}
}
-#ifdef sgi
template <>
-#endif
void UniformValue_Vec4::apply( Extensions *ext, const GLhandleARB progObj )
const
{
int loc = getLocation( ext, progObj );
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
