/[gentoo-x86]/sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch
Gentoo

Contents of /sci-mathematics/cgal/files/cgal-3.3.1-rpath.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Jan 10 10:37:34 2010 UTC (4 years, 8 months ago) by ssuominen
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
old
(Portage version: 2.2_rc61/cvs/Linux x86_64)

1 diff -urNad cgal-3.3.1~/install_cgal cgal-3.3.1/install_cgal
2 --- cgal-3.3.1~/install_cgal 2008-04-16 19:37:23.000000000 +0200
3 +++ cgal-3.3.1/install_cgal 2008-04-16 19:37:25.000000000 +0200
4 @@ -836,7 +836,7 @@
5 CGAL_SHARED_LIB_SONAME=""
6 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME)"
7 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME)"
8 - RUNTIME_LINKER_FLAG=''
9 +# RUNTIME_LINKER_FLAG=''
10 PRINT_STACKTRACE_PROGRAM="gdb"
11 WINDOWS_COMPILER=""
12 CYGWIN_COMPILER=""
13 @@ -937,7 +937,7 @@
14 #### settings for sgi mipspro compiler on irix5
15 CGAL_SHARED_LIB_CXXFLAGS=
16 CGAL_SHARED_LIB_LDFLAGS="-lm"
17 - RUNTIME_LINKER_FLAG="-rpath "
18 +# RUNTIME_LINKER_FLAG="-rpath "
19 PRINT_STACKTRACE_PROGRAM="dbx"
20 ;;
21 *IRIX*6.*CC*7.3*)
22 @@ -946,14 +946,14 @@
23 ADDITIONAL_LDFLAGS="-LANG:std"
24 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
25 CGAL_SHARED_LIB_CXXFLAGS=
26 - RUNTIME_LINKER_FLAG="-rpath "
27 +# RUNTIME_LINKER_FLAG="-rpath "
28 PRINT_STACKTRACE_PROGRAM="dbx"
29 ;;
30 *IRIX*6.*CC*)
31 #### settings for sgi mipspro compiler on irix6
32 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -ar -o''"
33 CGAL_SHARED_LIB_CXXFLAGS=
34 - RUNTIME_LINKER_FLAG="-rpath "
35 +# RUNTIME_LINKER_FLAG="-rpath "
36 PRINT_STACKTRACE_PROGRAM="dbx"
37 ;;
38 *IRIX*g++*)
39 @@ -961,7 +961,7 @@
40 ADDITIONAL_CXXFLAGS="-Wall"
41 LONG_NAME_PROBLEM_LDFLAGS="-U -s"
42 CGAL_SHARED_LIB_LDFLAGS="-lm"
43 - RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
44 +# RUNTIME_LINKER_FLAG="-Xlinker -rpath -Xlinker "
45 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
46 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
47 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
48 @@ -973,7 +973,7 @@
49 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
50 CGAL_SHARED_LIB_CXXFLAGS="-PIC"
51 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
52 - RUNTIME_LINKER_FLAG="-R "
53 +# RUNTIME_LINKER_FLAG="-R "
54 PRINT_STACKTRACE_PROGRAM="dbx"
55 CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
56 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
57 @@ -986,7 +986,7 @@
58 LONG_NAME_PROBLEM_CXXFLAGS="-g"
59 LONG_NAME_PROBLEM_LDFLAGS="-z nodefs -s"
60 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
61 - RUNTIME_LINKER_FLAG="-R "
62 +# RUNTIME_LINKER_FLAG="-R "
63 CGAL_SHARED_LIB_SONAME="-h \$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
64 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
65 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
66 @@ -995,7 +995,7 @@
67 #### settings for g++ on alpha-linux (special FPU handling)
68 #### LONG_NAME_PROBLEM is cured by disabling debugging
69 ADDITIONAL_CXXFLAGS="-Wall -mieee -mfp-rounding-mode=d"
70 - RUNTIME_LINKER_FLAG='-Wl,-R'
71 +# RUNTIME_LINKER_FLAG='-Wl,-R'
72 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
73 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
74 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
75 @@ -1003,7 +1003,7 @@
76 *Linux*g++*)
77 #### settings for g++ on linux
78 ADDITIONAL_CXXFLAGS="-Wall"
79 - RUNTIME_LINKER_FLAG='-Wl,-R'
80 +# RUNTIME_LINKER_FLAG='-Wl,-R'
81 CGAL_SHARED_LIB_SONAME="-Wl,-soname,\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
82 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
83 CGAL_SHARED_LIBNAME_WITH_SOMAJOR="\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
84 @@ -1013,12 +1013,12 @@
85 # -mp is required for correct enough floating point operations
86 # necessary for interval arithmetic.
87 ADDITIONAL_CXXFLAGS="-mp"
88 - RUNTIME_LINKER_FLAG='-Wl,-R'
89 +# RUNTIME_LINKER_FLAG='-Wl,-R'
90 PRINT_STACKTRACE_PROGRAM="idb"
91 ;;
92 *Linux*pgCC*|*Linux*pgcpp*)
93 #### settings for Portland Group Compiler on linux
94 - RUNTIME_LINKER_FLAG='-Wl,-R'
95 +# RUNTIME_LINKER_FLAG='-Wl,-R'
96 # PGCC has long name problems with "-g".
97 DEBUG_OPT=""
98 ;;
99 @@ -1029,7 +1029,7 @@
100 CGAL_STATIC_LIB_CREATE="\$(CGAL_CXX) -xar -o ''"
101 CGAL_SHARED_LIB_CXXFLAGS="-PIC"
102 CGAL_SHARED_LIB_CREATE="\$(CGAL_CXX) -G"
103 - RUNTIME_LINKER_FLAG="-R "
104 +# RUNTIME_LINKER_FLAG="-R "
105 PRINT_STACKTRACE_PROGRAM="dbx"
106 CGAL_SHARED_LIB_SONAME="-Qoption ld -h\$(CGAL_SHARED_LIBNAME).\$(SOMAJOR)"
107 CGAL_SHARED_LIBNAME_WITH_SOVERSION="\$(CGAL_SHARED_LIBNAME).\$(SOVERSION)"
108 @@ -4335,7 +4335,7 @@
109 _buildlog_marker="log for $1 $2 shown"
110
111 ${_printf} "%s %s\n" "${MAKE}" "${MAKE_OPTION}" > "${COMPILE_LOGFILE}"
112 - if ${MAKE} ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
113 + if ${MAKE} ${MAKE_OPTION} | tee "${COMPILE_LOGFILE}" 2>&1; then
114 log_print "Compilation of $1 $2 ${_libname} succeeded."
115 log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
116 eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}

  ViewVC Help
Powered by ViewVC 1.1.20