Tags: patch
Usertags: origin-ubuntu natty ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* Add libXm to linkers in GNUmakefiles. Fixes FTBFS
with binutils-gold. (Closes: #554921)
We thought you might be interested in doing the same.
--
Pozdrawiam / Kind regards,
Artur Rona
diff -u inventor-2.1.5-10/debian/changelog inventor-2.1.5-10/debian/changelog
--- inventor-2.1.5-10/debian/changelog
+++ inventor-2.1.5-10/debian/changelog
@@ -1,3 +1,10 @@
+inventor (2.1.5-10-14ubuntu2) natty; urgency=low
+
+ * Add libXm to linkers in GNUmakefiles. Fixes FTBFS
+ with binutils-gold. (Closes: #554921)
+
+ -- Artur Rona <ari-tc...@ubuntu.com> Sat, 02 Apr 2011 15:51:40 +0200
+
inventor (2.1.5-10-14ubuntu1) lucid; urgency=low
* Merge from debian testing. Remaining changes: LP: #508400
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/drop/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/drop/GNUmakefile
@@ -8,7 +8,7 @@
TsBlock.c++ TsPiece.c++ TsPieces.c++ TsField.c++ \
TsTrickle.c++ TsEvents.c++ TsRemoval.c++ TsViewer.c++ drop.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/qmorf/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/qmorf/GNUmakefile
@@ -6,7 +6,7 @@
CXXFILES = QuadThing.c++ Background.c++ FlashBackground.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/SceneViewer/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/SceneViewer/GNUmakefile
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventor -lInventorXt
+LLDLIBS = -lInventorWidget -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/textomatic/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/textomatic/GNUmakefile
@@ -8,7 +8,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/noodle/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/noodle/GNUmakefile
@@ -16,7 +16,7 @@
../../nodes/GeneralizedCylinder/NurbMaker.o \
../../nodes/GeneralizedCylinder/Triangulator.o \
../../nodes/GeneralizedCylinder/GeneralizedCylinder.o \
- -lInventor -lInventorXt
+ -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/revo/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/revo/GNUmakefile
@@ -10,7 +10,7 @@
LLDOPTS += -L../../samples/common
-LLDLIBS = -lcommon -lInventor -lInventorXt
+LLDLIBS = -lcommon -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/demos/gview/GNUmakefile
+++ inventor-2.1.5-10/apps/demos/gview/GNUmakefile
@@ -8,7 +8,7 @@
gview.c++ DisplayGraph.c++ Error.c++ FieldEditor.c++ \
GraphIcon.c++ GraphViewer.c++ NodeCreator.c++
-LLDLIBS = -lInventor -lInventorXt
+LLDLIBS = -lInventor -lInventorXt -lXm
all: all_ivbin
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/tools/ivview/GNUmakefile
+++ inventor-2.1.5-10/apps/tools/ivview/GNUmakefile
@@ -7,7 +7,7 @@
LLDOPTS += -L../../samples/widgets
-LLDLIBS = -lInventorWidget -lInventorXt -lInventor
+LLDLIBS = -lInventorWidget -lInventorXt -lInventor -lXm
all: all_ivbin
