Date: Fri, 11 Oct 2013 07:28:57 GMT From: Pietro Cerutti <gahr@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182900: [patch] graphics/inventor -- fix build with modern compilers Message-ID: <201310110728.r9B7SvBO039637@oldred.freebsd.org> Resent-Message-ID: <201310110730.r9B7U0Hi023695@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182900
>Category: ports
>Synopsis: [patch] graphics/inventor -- fix build with modern compilers
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 11 07:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release:
>Organization:
The FreeBSD Project
>Environment:
>Description:
The attached patch allows to build inventor with clang on 10.0.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 329984)
+++ Makefile (working copy)
@@ -149,6 +149,8 @@
@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ;\
s|%%CXX%%|${CXX}|g ; \
s|%%CXXFLAGS%%|${CXXFLAGS}|g' ${WRKSRC}/make/ivcommondefs
+ @${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \
+ ${WRKSRC}/lib/GNUmakefile
post-install:
@${CAT} ${PKGMESSAGE}
Index: files/patch-apps-demos-qmorf_quadCube.c++
===================================================================
--- files/patch-apps-demos-qmorf_quadCube.c++ (revision 0)
+++ files/patch-apps-demos-qmorf_quadCube.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/demos/qmorf/quadCube.c++.orig 2013-10-10 14:58:48.000000000 +0200
++++ apps/demos/qmorf/quadCube.c++ 2013-10-10 14:58:56.000000000 +0200
+@@ -182,7 +182,7 @@
+ return result;
+ }
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ if (argc > 1) diagonalFlag = 0;
+
Property changes on: files/patch-apps-demos-qmorf_quadCube.c++
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-apps-demos-qmorf_quadSheet.c++
===================================================================
--- files/patch-apps-demos-qmorf_quadSheet.c++ (revision 0)
+++ files/patch-apps-demos-qmorf_quadSheet.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/demos/qmorf/quadSheet.c++.orig 2013-10-10 14:59:43.000000000 +0200
++++ apps/demos/qmorf/quadSheet.c++ 2013-10-10 14:59:47.000000000 +0200
+@@ -68,7 +68,7 @@
+ return result;
+ }
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ SoDB::init();
+
Property changes on: files/patch-apps-demos-qmorf_quadSheet.c++
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-apps-demos-qmorf_quadSphere.c++
===================================================================
--- files/patch-apps-demos-qmorf_quadSphere.c++ (revision 0)
+++ files/patch-apps-demos-qmorf_quadSphere.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/demos/qmorf/quadSphere.c++.orig 2013-10-10 14:58:13.000000000 +0200
++++ apps/demos/qmorf/quadSphere.c++ 2013-10-10 14:58:20.000000000 +0200
+@@ -76,7 +76,7 @@
+ return result;
+ }
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ SoDB::init();
+
Property changes on: files/patch-apps-demos-qmorf_quadSphere.c++
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-apps-demos-revo_GNUmakefile
===================================================================
--- files/patch-apps-demos-revo_GNUmakefile (revision 0)
+++ files/patch-apps-demos-revo_GNUmakefile (working copy)
@@ -0,0 +1,14 @@
+--- apps/demos/revo/GNUmakefile.orig 2013-10-10 15:00:56.000000000 +0200
++++ apps/demos/revo/GNUmakefile 2013-10-10 15:01:29.000000000 +0200
+@@ -8,9 +8,9 @@
+
+ CXXFILES = revo.c++ RevClass.c++ profile.c++
+
+-LLDOPTS += -L../../samples/common
++LLDOPTS +=
+
+-LLDLIBS = -lcommon -lInventor -lInventorXt
++LLDLIBS = ../../samples/common/libcommon.a -lInventor -lInventorXt
+
+ all: all_ivbin
+
Property changes on: files/patch-apps-demos-revo_GNUmakefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-apps-demos-textomatic_GNUmakefile
===================================================================
--- files/patch-apps-demos-textomatic_GNUmakefile (revision 0)
+++ files/patch-apps-demos-textomatic_GNUmakefile (working copy)
@@ -0,0 +1,11 @@
+--- apps/demos/textomatic/GNUmakefile.orig 2013-10-10 15:01:55.000000000 +0200
++++ apps/demos/textomatic/GNUmakefile 2013-10-10 15:02:12.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ LLDOPTS += -L../../samples/common
+
+-LLDLIBS = -lcommon -lInventor -lInventorXt
++LLDLIBS = ../../samples/common/libcommon.a -lInventor -lInventorXt
+
+ all: all_ivbin
+
Property changes on: files/patch-apps-demos-textomatic_GNUmakefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-apps-samples-widgets_componentTest.c++
===================================================================
--- files/patch-apps-samples-widgets_componentTest.c++ (revision 0)
+++ files/patch-apps-samples-widgets_componentTest.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/samples/widgets/componentTest.c++.orig 2013-10-10 14:53:45.000000000 +0200
++++ apps/samples/widgets/componentTest.c++ 2013-10-10 14:53:54.000000000 +0200
+@@ -60,7 +60,7 @@
+ }
+
+ int
+-main(unsigned int argc, char *argv[])
++main(int argc, char *argv[])
+ {
+ if (argc != 2)
+ usage(argv[0]);
Property changes on: files/patch-apps-samples-widgets_componentTest.c++
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-apps-tools-ivcat_ivcat.c++
===================================================================
--- files/patch-apps-tools-ivcat_ivcat.c++ (revision 0)
+++ files/patch-apps-tools-ivcat_ivcat.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/tools/ivcat/ivcat.c++.orig 2013-10-10 14:54:27.000000000 +0200
++++ apps/tools/ivcat/ivcat.c++ 2013-10-10 14:54:37.000000000 +0200
+@@ -215,7 +215,7 @@
+ }
+ }
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ int expandFileNodes = 0;
+ int expandTextureNodes = 0;
Property changes on: files/patch-apps-tools-ivcat_ivcat.c++
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-apps-tools-ivfix_ivfix.c++
===================================================================
--- files/patch-apps-tools-ivfix_ivfix.c++ (revision 0)
+++ files/patch-apps-tools-ivfix_ivfix.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/tools/ivfix/ivfix.c++.orig 2013-10-10 14:55:27.000000000 +0200
++++ apps/tools/ivfix/ivfix.c++ 2013-10-10 14:55:33.000000000 +0200
+@@ -80,7 +80,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ OptionInfo options;
+
Property changes on: files/patch-apps-tools-ivfix_ivfix.c++
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-apps-tools-ivinfo_ivinfo.c++
===================================================================
--- files/patch-apps-tools-ivinfo_ivinfo.c++ (revision 0)
+++ files/patch-apps-tools-ivinfo_ivinfo.c++ (working copy)
@@ -0,0 +1,11 @@
+--- apps/tools/ivinfo/ivinfo.c++.orig 2013-10-10 14:56:40.000000000 +0200
++++ apps/tools/ivinfo/ivinfo.c++ 2013-10-10 14:56:45.000000000 +0200
+@@ -159,7 +159,7 @@
+ }
+ }
+
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ SoInput in;
+ SoNode *root;
Property changes on: files/patch-apps-tools-ivinfo_ivinfo.c++
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-doc-man-ivman_Main.c++
===================================================================
--- files/patch-doc-man-ivman_Main.c++ (revision 0)
+++ files/patch-doc-man-ivman_Main.c++ (working copy)
@@ -0,0 +1,11 @@
+--- doc/man/ivman/Main.c++.orig 2013-10-10 14:52:11.000000000 +0200
++++ doc/man/ivman/Main.c++ 2013-10-10 14:52:17.000000000 +0200
+@@ -89,7 +89,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ SbBool ok = TRUE;
+ int c, curArg;
Property changes on: files/patch-doc-man-ivman_Main.c++
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-lib-GNUmakefile
===================================================================
--- files/patch-lib-GNUmakefile (revision 329984)
+++ files/patch-lib-GNUmakefile (working copy)
@@ -1,15 +1,13 @@
-*** lib/GNUmakefile Sat Dec 14 18:23:15 2002
---- lib/GNUmakefile.new Sat Dec 14 17:30:19 2002
-***************
-*** 10,15 ****
---- 10,19 ----
- -lX11 -lm \
- -lGLU -lGL
-
-+ ifeq ($(usingFreeBSD), 1)
-+ LLDLIBS += -lXext -liconv
-+ endif
-+
- OBJECTS = \
- ./database/src/sb/projectors/SbProjectors.o \
- ./database/src/sb/Sb.o \
+--- lib/GNUmakefile.orig 2001-09-25 02:45:32.000000000 +0200
++++ lib/GNUmakefile 2013-10-10 14:49:54.000000000 +0200
+@@ -10,6 +10,10 @@
+ -lX11 -lm \
+ -lGLU -lGL
+
++ifeq ($(usingFreeBSD), 1)
++LLDLIBS += -lXext %%ICONV_LIB%%
++endif
++
+ OBJECTS = \
+ ./database/src/sb/projectors/SbProjectors.o \
+ ./database/src/sb/Sb.o \
Index: files/patch-tools-ppp_ppp.c++
===================================================================
--- files/patch-tools-ppp_ppp.c++ (revision 0)
+++ files/patch-tools-ppp_ppp.c++ (working copy)
@@ -0,0 +1,11 @@
+--- tools/ppp/ppp.c++.orig 2013-10-10 14:43:30.000000000 +0200
++++ tools/ppp/ppp.c++ 2013-10-10 14:48:56.000000000 +0200
+@@ -627,7 +627,7 @@
+ //
+ //////////////////////////////////////////////////////////////////////////////
+
+-main(int, char *argv[])
++int main(int, char *argv[])
+ {
+ char buf[1024];
+ Line line;
Property changes on: files/patch-tools-ppp_ppp.c++
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310110728.r9B7SvBO039637>