Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/goffice-01-no-sunmath-lib.diff
author nonsea
Tue, 24 Jun 2008 13:06:12 +0000
changeset 1233 0d7e552adbcf
parent 671 fc006486f467
child 1235 4337d6b3fb42
permissions -rw-r--r--
2008-06-24 Halton Huo <[email protected]> * SFEgoffice.spec: Split base part to base/goffice.spec * base-specs/goffice.spec: (new) Bump to 0.6.4 * base-specs/tsclient.spec: remove dup * patches/goffice-01-no-sunmath-lib.diff: rework
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1233
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
     1
 
Index: trunk/configure.in
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
     2
 
===================================================================
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
     3
 
--- trunk/configure.in	(revision 2123)
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
     4
 
+++ trunk/configure.in	(working copy)
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
     5
 
@@ -440,7 +440,9 @@
658
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
     6
 
 if test $ac_cv_c_long_double = yes; then
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
     7
 
     have_mandatory_funcs=yes
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
     8
 
     need_sunmath=0
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
     9
 
-    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
1233
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    10
 
+    ss_cc=`which cc`
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    11
 
+    ss_dir=`dirname $ss_cc`"/.."
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    12
 
+    sunmathlinkstuff="-L$ss_dir/lib -R$ss_dir/lib -lsunmath"
658
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
    13
 
     for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
    14
 
 	    AC_CHECK_FUNC($ldfunc,
6b765274caa4 Added - forgotten on Friday.
daymobrew
parents:
diff changeset 
    15
 
 		  ,
1233
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    16
 
@@ -452,12 +454,12 @@
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    17
 
 			  [ if test $need_sunmath = 0; then
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    18
 
 				# FIXME: better idea?
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    19
 
 				LDFLAGS="$LDFLAGS $sunmathlinkstuff"
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    20
 
-				sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'`
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    21
 
+				sunmathinclude=`ls -d $ss_dir/*/include/cc | sed '$!d'`
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    22
 
 				CPPFLAGS="$CPPFLAGS -I$sunmathinclude"
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    23
 
 			    fi
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    24
 
 			    need_sunmath=1 ],
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    25
 
 			  [have_mandatory_funcs=no],
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    26
 
-			  [-L/opt/SUNWspro/lib $GOFFICE_LIBS])])])
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    27
 
+			  [-L$ss_dir/lib $GOFFICE_LIBS])])])
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    28
 
     done
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    29
 
     if test $need_sunmath = 1; then
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    30
 
 	EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff"
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    31
 
@@ -467,6 +469,8 @@
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    32
 
 			 [AC_MSG_WARN([Long doubles require the $ac_header header.])
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    33
 
 			  have_mandatory_funcs=no])
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    34
 
     fi
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    35
 
+    unset ss_cc
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    36
 
+    unset ss_dir
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    37
 
     unset need_sunmath
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    38
 
     unset sunmathlinkstuff
0d7e552adbcf 2008-06-24 Halton Huo <[email protected]>
nonsea
parents: 671
diff changeset 
    39
 
     unset sunmathinclude
upstream/spec-files-extra