View | Details | Raw Unified | Return to bug 209436
Collapse All | Expand All

(-)cad/openvsp/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/cad/openvsp/Makefile 413788 2016-04-22 17:15:02Z pi $
2
# $FreeBSD: head/cad/openvsp/Makefile 413788 2016-04-22 17:15:02Z pi $
3
3
4
PORTNAME=	openvsp
4
PORTNAME=	openvsp
5
PORTVERSION=	3.5.2
5
PORTVERSION=	3.6.0
6
PORTREVISION=	0
6
PORTREVISION=	0
7
CATEGORIES=	cad
7
CATEGORIES=	cad
8
MASTER_SITES=	GH
8
MASTER_SITES=	GH
Lines 55-61 Link Here
55
USE_GNOME=	libxml2
55
USE_GNOME=	libxml2
56
CFLAGS+=	-I${LOCALBASE}/include/openNURBS
56
CFLAGS+=	-I${LOCALBASE}/include/openNURBS
57
57
58
BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.5.2-FreeBSD
58
BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-3.6.0-FreeBSD
59
59
60
do-install:
60
do-install:
61
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
61
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin
(-)cad/openvsp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 0267d53fa88d5a1fae888131682cd7383b861680a3ed079597ad5b059e169d0e
1
SHA256 (OpenVSP-OpenVSP-3.6.0-OpenVSP_3.6.0_GH0.tar.gz) = c2439d5bb4600011d9230531ec2f5c798e869ee607c502ca53784a85295d2256
2
SIZE (OpenVSP-OpenVSP-3.5.2-OpenVSP_3.5.2_GH0.tar.gz) = 27883392
2
SIZE (OpenVSP-OpenVSP-3.6.0-OpenVSP_3.6.0_GH0.tar.gz) = 28793759
(-)cad/openvsp/files/patch-Libraries_cmake_External__libIGES.cmake (-12 lines)
Lines 1-12 Link Here
1
--- Libraries/cmake/External_libIGES.cmake.orig	2016-02-14 00:01:30 UTC
2
+++ Libraries/cmake/External_libIGES.cmake
3
@@ -1,6 +1,9 @@
4
 
5
 #    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libIGES/
6
 
7
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
8
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
9
+
10
 ExternalProject_Add( LIBIGES
11
     URL ${CMAKE_CURRENT_SOURCE_DIR}/libIGES-03f6ee919151.zip
12
 	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
(-)cad/openvsp/files/patch-src_cfd__mesh_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/cfd_mesh/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/cfd_mesh/CMakeLists.txt
3
@@ -48,6 +48,8 @@ SurfPatch.h
4
 Tri.h
5
 )
6
 
7
+set_target_properties( cfd_mesh PROPERTIES COMPILE_FLAGS "-fPIC")
8
+
9
 ADD_DEPENDENCIES( cfd_mesh
10
 util
11
 )
(-)cad/openvsp/files/patch-src_cmake_External__STEPCode.cmake (-19 lines)
Lines 1-19 Link Here
1
--- src/cmake/External_STEPCode.cmake.orig	2016-02-14 00:01:30 UTC
2
+++ src/cmake/External_STEPCode.cmake
3
@@ -8,6 +8,9 @@ ELSE()
4
     SET( SC_SHARED ON )
5
 ENDIF()
6
 
7
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
8
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
9
+
10
 ExternalProject_Add( STEPCODE
11
 	URL ${CMAKE_CURRENT_SOURCE_DIR}/stepcode-7dcd6ef3418a.zip
12
 	CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
13
@@ -37,4 +40,4 @@ SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
14
 # Consequently, force Debug so it installs in ../sc-install directory
15
 # instead of /usr/local/lib.
16
 #
17
-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF
18
\ No newline at end of file
19
+# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF
(-)cad/openvsp/files/patch-src_external_CMakeLists.txt (-12 lines)
Lines 1-12 Link Here
1
--- src/external/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/CMakeLists.txt
3
@@ -8,6 +8,9 @@ FIND_PACKAGE(CPPTest REQUIRED)
4
 SET( CMAKE_PREFIX_PATH ${LIBXML2_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
5
 FIND_PACKAGE(LibXml2 REQUIRED)
6
 
7
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
8
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
9
+
10
 IF( NOT VSP_NO_GRAPHICS )
11
 	SET( CMAKE_PREFIX_PATH ${FLTK_INSTALL_DIR} ${ORIG_CMAKE_PREFIX_PATH} )
12
 	FIND_PACKAGE(FLTK REQUIRED)
(-)cad/openvsp/files/patch-src_external_angelscript_sdk_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/external/angelscript/sdk/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/angelscript/sdk/CMakeLists.txt
3
@@ -127,6 +127,8 @@ set(LIBRARY_OUTPUT_PATH  ${PROJECT_BINAR
4
 find_package(Threads)
5
 target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT})
6
 
7
+set_target_properties( Angelscript PROPERTIES COMPILE_FLAGS "-fPIC")
8
+
9
 if(MSVC)
10
         set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP")
11
 endif(MSVC)
(-)cad/openvsp/files/patch-src_external_glfont2_CMakeLists.txt (-10 lines)
Lines 1-10 Link Here
1
--- src/external/glfont2/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/glfont2/CMakeLists.txt
3
@@ -3,6 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
4
 SET(GLFONT2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to glfont2 headers")
5
 
6
 INCLUDE_DIRECTORIES( ${GLFONT2_INCLUDE_DIR}
7
+	/usr/local/include
8
 )
9
 
10
 ADD_LIBRARY( glfont2
(-)cad/openvsp/files/patch-src_external_sixseries_CMakeLists.txt (-8 lines)
Lines 1-8 Link Here
1
--- src/external/sixseries/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/sixseries/CMakeLists.txt
3
@@ -10,3 +10,5 @@ s_copy.c
4
 s_stop.c
5
 f2c.h
6
 )
7
+
8
+set_target_properties( sixseries PROPERTIES COMPILE_FLAGS "-fPIC")
(-)cad/openvsp/files/patch-src_external_triangle_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/external/triangle/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/triangle/CMakeLists.txt
3
@@ -9,6 +9,8 @@ triangle.c
4
 triangle.h
5
 )
6
 
7
+set_target_properties( triangle PROPERTIES COMPILE_FLAGS "-fPIC")
8
+
9
 # set MS Visual Compiler flags
10
 IF(WIN32)
11
   SET_TARGET_PROPERTIES( triangle PROPERTIES COMPILE_FLAGS "-fp:strict")
(-)cad/openvsp/files/patch-src_external_tritri_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/external/tritri/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/external/tritri/CMakeLists.txt
3
@@ -10,4 +10,6 @@ intersect_AABB.cpp
4
 intersect_triangle.cpp
5
 Tritri.cpp
6
 Tritri.h
7
-)
8
\ No newline at end of file
9
+)
10
+
11
+set_target_properties( tritri PROPERTIES COMPILE_FLAGS "-fPIC")
(-)cad/openvsp/files/patch-src_fltk__screens_CMakeLists.txt (-12 lines)
Lines 1-12 Link Here
1
--- src/fltk_screens/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/fltk_screens/CMakeLists.txt
3
@@ -4,6 +4,9 @@ INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR}
4
 
5
 SET(SCREENS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path to FLTK generated *.h files")
6
 
7
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
8
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
9
+
10
 FLTK_WRAP_UI( screens
11
 aboutScreen.fl
12
 awaveFlScreen.fl
(-)cad/openvsp/files/patch-src_geom__api_CMakeLists.txt (-27 lines)
Lines 1-27 Link Here
1
--- src/geom_api/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/geom_api/CMakeLists.txt
3
@@ -29,6 +29,8 @@ GuiInterface.h
4
 VSP_Geom_API.h
5
 )
6
 
7
+set_target_properties( geom_api PROPERTIES COMPILE_FLAGS "-fPIC")
8
+
9
 ADD_DEPENDENCIES( geom_api
10
 util
11
 )
12
@@ -49,7 +51,7 @@ IF( NOT VSP_NO_GRAPHICS )
13
 	util
14
 	)
15
 
16
-	set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
17
+set_target_properties( geom_api_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
18
 
19
 	ADD_LIBRARY( gui_interface_g
20
 	GuiInterface.cpp
21
@@ -61,5 +63,5 @@ IF( NOT VSP_NO_GRAPHICS )
22
 	util
23
 	)
24
 
25
-	set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1")
26
+set_target_properties( gui_interface_g PROPERTIES COMPILE_FLAGS "-DVSP_USE_FLTK=1 -fPIC")
27
 ENDIF()
(-)cad/openvsp/files/patch-src_geom__core_CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/geom_core/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/geom_core/CMakeLists.txt
3
@@ -116,6 +116,8 @@ XSecCurve.h
4
 XSecSurf.h
5
 )
6
 
7
+set_target_properties( geom_core PROPERTIES COMPILE_FLAGS "-fPIC")
8
+
9
 ADD_DEPENDENCIES( geom_core
10
 util
11
 )
(-)cad/openvsp/files/patch-src_gui__and__draw_CMakeLists.txt (-20 lines)
Lines 1-20 Link Here
1
--- src/gui_and_draw/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/gui_and_draw/CMakeLists.txt
3
@@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( 
4
     ${STEPCODE_INCLUDE_DIR}
5
     ${LIBIGES_INCLUDE_DIR}
6
     ${GUI_AND_DRAW_INCLUDE_DIR}
7
+    /usr/local/include
8
 )
9
 
10
 ADD_LIBRARY(gui_and_draw
11
@@ -130,6 +131,9 @@ VSPWindow.h
12
 WingScreen.h
13
 )
14
 
15
+SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
16
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
17
+
18
 ADD_DEPENDENCIES(gui_and_draw
19
 geom_core
20
 vsp_graphic
(-)cad/openvsp/files/patch-src_gui__and__draw_GroupLayout.h (-11 lines)
Lines 1-11 Link Here
1
--- src/gui_and_draw/GroupLayout.h.orig	2016-02-14 00:01:30 UTC
2
+++ src/gui_and_draw/GroupLayout.h
3
@@ -17,7 +17,7 @@
4
 #include <FL/Fl_Text_Editor.H>
5
 #include <FL/Fl_Radio_Button.H>
6
 #include <FL/Fl_Color_Chooser.H>
7
-#include <FL/Fl_Sys_Menu_Bar.h>
8
+#include <FL/Fl_Sys_Menu_Bar.H>
9
 
10
 #include "GuiDevice.h"
11
 
(-)cad/openvsp/files/patch-src_gui__and__draw_MainVSPScreen.h (-11 lines)
Lines 1-11 Link Here
1
--- src/gui_and_draw/MainVSPScreen.h.orig	2016-02-14 00:01:30 UTC
2
+++ src/gui_and_draw/MainVSPScreen.h
3
@@ -15,7 +15,7 @@
4
 #include "MenuItem.h"
5
 #include "ScreenBase.h"
6
 #include "GuiDevice.h"
7
-#include "FL/Fl_Box.h"
8
+#include "FL/Fl_Box.H"
9
 
10
 namespace VSPGUI
11
 {
(-)cad/openvsp/files/patch-src_gui__and__draw_MenuItem.h (-11 lines)
Lines 1-11 Link Here
1
--- src/gui_and_draw/MenuItem.h.orig	2016-02-14 00:01:30 UTC
2
+++ src/gui_and_draw/MenuItem.h
3
@@ -10,7 +10,7 @@
4
 #define MENUITEM__INCLUDED_
5
 
6
 #include <string>
7
-#include <FL/Fl_Sys_Menu_Bar.h>
8
+#include <FL/Fl_Sys_Menu_Bar.H>
9
 
10
 class ScreenMgr;
11
 class ActionScreen;
(-)cad/openvsp/files/patch-src_util_CMakeLists.txt (-8 lines)
Lines 1-8 Link Here
1
--- src/util/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/util/CMakeLists.txt
3
@@ -63,3 +63,5 @@ XferSurf.h
4
 ADD_DEPENDENCIES( util
5
 STEPCODE
6
 )
7
+
8
+set_target_properties( util PROPERTIES COMPILE_FLAGS "-fPIC")
(-)cad/openvsp/files/patch-src_vsp__aero_CMakeLists.txt (-10 lines)
Lines 1-10 Link Here
1
--- src/vsp_aero/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/vsp_aero/CMakeLists.txt
3
@@ -1,4 +1,7 @@
4
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
5
 
6
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
7
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
8
+
9
 ADD_SUBDIRECTORY( solver )
10
 ADD_SUBDIRECTORY( viewer )
(-)cad/openvsp/files/patch-src_vsp__graphic_CMakeLists.txt (-12 lines)
Lines 1-12 Link Here
1
--- src/vsp_graphic/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/vsp_graphic/CMakeLists.txt
3
@@ -4,6 +4,9 @@ SET(VSP_GRAPHIC_INCLUDE_DIR ${CMAKE_CURR
4
 
5
 set(GRAPHIC_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)
6
 
7
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
8
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
9
+
10
 FILE(GLOB_RECURSE GRAPHIC_HEADER ./include/*.h)
11
 FILE(GLOB_RECURSE GRAPHIC_SOURCE ./src/*.cpp)
12
 
(-)cad/openvsp/files/patch-src_vsp__graphic_src_Image.cpp (-10 lines)
Lines 1-10 Link Here
1
--- src/vsp_graphic/src/Image.cpp.orig	2016-02-14 00:01:30 UTC
2
+++ src/vsp_graphic/src/Image.cpp
3
@@ -1,6 +1,7 @@
4
 #include <assert.h>
5
 #include <MultiImageLoader.h>
6
 #include <algorithm>
7
+#include <stdlib.h>
8
 
9
 #include "Image.h"
10
 
(-)cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp (-10 lines)
Lines 1-10 Link Here
1
--- src/vsp_graphic/src/Scene.cpp.orig	2016-04-22 13:35:09 UTC
2
+++ src/vsp_graphic/src/Scene.cpp
3
@@ -16,6 +16,7 @@
4
 #include "ByteOperationUtil.h"
5
 
6
 #include <assert.h>
7
+#include <stdlib.h>
8
 
9
 namespace VSPGraphic
10
 {
(-)cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp (-9 lines)
Lines 1-9 Link Here
1
--- src/vsp_graphic/src/Shader.cpp.orig	2016-02-14 00:01:30 UTC
2
+++ src/vsp_graphic/src/Shader.cpp
3
@@ -1,5 +1,6 @@
4
 #include <assert.h>
5
 #include <string>
6
+#include <stdlib.h>
7
 
8
 #include "Shader.h"
9
 
(-)cad/openvsp/files/patch-src_xmlvsp_CMakeLists.txt (-9 lines)
Lines 1-9 Link Here
1
--- src/xmlvsp/CMakeLists.txt.orig	2016-02-14 00:01:30 UTC
2
+++ src/xmlvsp/CMakeLists.txt
3
@@ -14,3 +14,6 @@ XmlUtil.h
4
 XmlUtil.cpp
5
 
6
 )
7
+
8
+set_target_properties( xmlvsp PROPERTIES COMPILE_FLAGS "-fPIC")
9
+
(-)cad/openvsp/pkg-plist (+2 lines)
Lines 20-28 Link Here
20
%%DATADIR%%/Seat.vsppart
20
%%DATADIR%%/Seat.vsppart
21
%%DATADIR%%/SeatGroup.vsppart
21
%%DATADIR%%/SeatGroup.vsppart
22
%%DATADIR%%/SharkTeeth.tga
22
%%DATADIR%%/SharkTeeth.tga
23
%%DATADIR%%/SnapToDemo.vspscript
23
%%DATADIR%%/Stack.vspscript
24
%%DATADIR%%/Stack.vspscript
24
%%DATADIR%%/SubSurface.vspscript
25
%%DATADIR%%/SubSurface.vspscript
25
%%DATADIR%%/TestAll.vspscript
26
%%DATADIR%%/TestAll.vspscript
27
%%DATADIR%%/TestAnalysis.vspscript
26
%%DATADIR%%/TransportFuse.vsppart
28
%%DATADIR%%/TransportFuse.vsppart
27
%%DATADIR%%/Wing.vspscript
29
%%DATADIR%%/Wing.vspscript
28
%%DATADIR%%/b737a.af
30
%%DATADIR%%/b737a.af

Return to bug 209436