|
1 Allow language modules to be installed in the right place. |
|
2 |
|
3 For Python, ensure the use of the vendor-packages directory, as well as the |
|
4 use of a 64-bit-specific directory, as needed. |
|
5 |
|
6 For Lua, the appropriate variable will need to be set during installation, |
|
7 since there's no corresponding config_lua.lua file. |
|
8 |
|
9 This is an in-house patch, but has not been passed upstream because it's |
|
10 against a version of graphviz that is out of date; submission will be |
|
11 reconsidered when we upgrade. Note that at least the Python portion is |
|
12 Solaris-specific, and likely will not be accepted. |
|
13 |
|
14 --- graphviz-2.28.0/config/config_python.py Sat Mar 26 10:49:00 2005 |
|
15 +++ graphviz-2.28.0/config/config_python.py Mon Jun 30 14:38:34 2014 |
|
16 @@ -1,12 +1,20 @@ |
|
17 import sys |
|
18 +import struct |
|
19 from distutils import sysconfig |
|
20 |
|
21 +if struct.calcsize('P') == 8: |
|
22 + sixtyfour = "/64" |
|
23 +else: |
|
24 + sixtyfour = "" |
|
25 + |
|
26 +pyver = ".".join(str(i) for i in sys.version_info[:2]) |
|
27 + |
|
28 if sys.argv[1] == "archlib": |
|
29 - print sysconfig.get_python_lib(1,1) |
|
30 + print sysconfig.get_python_lib(1,1) + sixtyfour |
|
31 elif sys.argv[1] == "lib": |
|
32 print sysconfig.get_python_lib(0,1) |
|
33 elif sys.argv[1] == "archsitelib": |
|
34 - print sysconfig.get_python_lib(1,0) |
|
35 + print "/usr/lib/python%s/vendor-packages%s" % (pyver, sixtyfour) |
|
36 elif sys.argv[1] == "sitelib": |
|
37 print sysconfig.get_python_lib(0,0) |
|
38 |
|
39 --- graphviz-2.28.0/tclpkg/Makefile.in Fri May 6 20:27:53 2011 |
|
40 +++ graphviz-2.28.0/tclpkg/Makefile.in Mon Jun 30 15:30:49 2014 |
|
41 @@ -878,10 +878,10 @@ |
|
42 # ./configure --prefix=$HOME/graphviz; make; make install |
|
43 # without root priviledges. |
|
44 install-data-hook: |
|
45 -@WITH_LUA_TRUE@ -mkdir -p $(DESTDIR)@LUA_INSTALL_DIR@; |
|
46 -@WITH_LUA_TRUE@ if test -w $(DESTDIR)@LUA_INSTALL_DIR@; then \ |
|
47 -@WITH_LUA_TRUE@ (cd $(DESTDIR)@LUA_INSTALL_DIR@; \ |
|
48 -@WITH_LUA_TRUE@ $(LN_S) -f $(pkgluadir)/libgv_lua.so gv.so;) \ |
|
49 +@WITH_LUA_TRUE@ -mkdir -p $(DESTDIR)$(LUA_INSTALL_DIR); |
|
50 +@WITH_LUA_TRUE@ if test -w $(DESTDIR)$(LUA_INSTALL_DIR); then \ |
|
51 +@WITH_LUA_TRUE@ (cd $(DESTDIR)$(LUA_INSTALL_DIR); \ |
|
52 +@WITH_LUA_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgluadir)/libgv_lua.so gv.so;) \ |
|
53 @WITH_LUA_TRUE@ else \ |
|
54 @WITH_LUA_TRUE@ echo "Warning: @LUA_INSTALL_DIR@ is not writable."; \ |
|
55 @WITH_LUA_TRUE@ echo "Skipping system installation of lua binding."; \ |
|
56 @@ -889,8 +889,8 @@ |
|
57 @WITH_PERL_TRUE@ -mkdir -p $(DESTDIR)@PERL_INSTALL_DIR@; |
|
58 @WITH_PERL_TRUE@ if test -w $(DESTDIR)@PERL_INSTALL_DIR@; then \ |
|
59 @WITH_PERL_TRUE@ (cd $(DESTDIR)@PERL_INSTALL_DIR@; \ |
|
60 -@WITH_PERL_TRUE@ $(LN_S) -f $(pkgperldir)/libgv_perl.so gv.so; \ |
|
61 -@WITH_PERL_TRUE@ $(LN_S) -f $(pkgperldir)/gv.pm gv.pm;) \ |
|
62 +@WITH_PERL_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgperldir)/libgv_perl.so gv.so; \ |
|
63 +@WITH_PERL_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgperldir)/gv.pm gv.pm;) \ |
|
64 @WITH_PERL_TRUE@ else \ |
|
65 @WITH_PERL_TRUE@ echo "Warning: @PERL_INSTALL_DIR@ is not writable."; \ |
|
66 @WITH_PERL_TRUE@ echo "Skipping system installation of perl binding."; \ |
|
67 @@ -898,7 +898,7 @@ |
|
68 @WITH_PHP_TRUE@ -mkdir -p $(DESTDIR)@PHP_INSTALL_DIR@; |
|
69 @WITH_PHP_TRUE@ if test -w $(DESTDIR)@PHP_INSTALL_DIR@; then \ |
|
70 @WITH_PHP_TRUE@ (cd $(DESTDIR)@PHP_INSTALL_DIR@; \ |
|
71 -@WITH_PHP_TRUE@ $(LN_S) -f $(pkgphpdir)/libgv_php.so gv.so;) \ |
|
72 +@WITH_PHP_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgphpdir)/libgv_php.so gv.so;) \ |
|
73 @WITH_PHP_TRUE@ else \ |
|
74 @WITH_PHP_TRUE@ echo "Warning: @PHP_INSTALL_DIR@ is not writable."; \ |
|
75 @WITH_PHP_TRUE@ echo "Skipping system installation of php binding."; \ |
|
76 @@ -906,7 +906,7 @@ |
|
77 @WITH_PHP_TRUE@ -mkdir -p $(DESTDIR)@PHP_INSTALL_DATADIR@; |
|
78 @WITH_PHP_TRUE@ if test -w $(DESTDIR)@PHP_INSTALL_DATADIR@; then \ |
|
79 @WITH_PHP_TRUE@ (cd $(DESTDIR)@PHP_INSTALL_DATADIR@; \ |
|
80 -@WITH_PHP_TRUE@ $(LN_S) -f $(pkgphpdir)/gv.php gv.php;) \ |
|
81 +@WITH_PHP_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgphpdir)/gv.php gv.php;) \ |
|
82 @WITH_PHP_TRUE@ else \ |
|
83 @WITH_PHP_TRUE@ echo "Warning: @PHP_INSTALL_DATADIR@ is not writable."; \ |
|
84 @WITH_PHP_TRUE@ echo "Skipping system installation of php binding."; \ |
|
85 @@ -914,8 +914,8 @@ |
|
86 @WITH_PYTHON_TRUE@ -mkdir -p $(DESTDIR)@PYTHON_INSTALL_DIR@; |
|
87 @WITH_PYTHON_TRUE@ if test -w $(DESTDIR)@PYTHON_INSTALL_DIR@; then \ |
|
88 @WITH_PYTHON_TRUE@ (cd $(DESTDIR)@PYTHON_INSTALL_DIR@; \ |
|
89 -@WITH_PYTHON_TRUE@ $(LN_S) -f $(pkgpythondir)/libgv_python.so _gv.so; \ |
|
90 -@WITH_PYTHON_TRUE@ $(LN_S) -f $(pkgpythondir)/gv.py gv.py;) \ |
|
91 +@WITH_PYTHON_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpythondir)/libgv_python.so _gv.so; \ |
|
92 +@WITH_PYTHON_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpythondir)/gv.py gv.py;) \ |
|
93 @WITH_PYTHON_TRUE@ else \ |
|
94 @WITH_PYTHON_TRUE@ echo "Warning: @PYTHON_INSTALL_DIR@ is not writable."; \ |
|
95 @WITH_PYTHON_TRUE@ echo "Skipping system installation of python binding."; \ |
|
96 @@ -923,8 +923,8 @@ |
|
97 @WITH_PYTHON23_TRUE@ -mkdir -p $(DESTDIR)@PYTHON23_INSTALL_DIR@; |
|
98 @WITH_PYTHON23_TRUE@ if test -w $(DESTDIR)@PYTHON23_INSTALL_DIR@; then \ |
|
99 @WITH_PYTHON23_TRUE@ (cd $(DESTDIR)@PYTHON23_INSTALL_DIR@; \ |
|
100 -@WITH_PYTHON23_TRUE@ $(LN_S) -f $(pkgpython23dir)/libgv_python23.so _gv.so; \ |
|
101 -@WITH_PYTHON23_TRUE@ $(LN_S) -f $(pkgpython23dir)/gv.py gv.py;) \ |
|
102 +@WITH_PYTHON23_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython23dir)/libgv_python23.so _gv.so; \ |
|
103 +@WITH_PYTHON23_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython23dir)/gv.py gv.py;) \ |
|
104 @WITH_PYTHON23_TRUE@ else \ |
|
105 @WITH_PYTHON23_TRUE@ echo "Warning: @PYTHON23_INSTALL_DIR@ is not writable."; \ |
|
106 @WITH_PYTHON23_TRUE@ echo "Skipping system installation of python23 binding."; \ |
|
107 @@ -932,8 +932,8 @@ |
|
108 @WITH_PYTHON24_TRUE@ -mkdir -p $(DESTDIR)@PYTHON24_INSTALL_DIR@; |
|
109 @WITH_PYTHON24_TRUE@ if test -w $(DESTDIR)@PYTHON24_INSTALL_DIR@; then \ |
|
110 @WITH_PYTHON24_TRUE@ (cd $(DESTDIR)@PYTHON24_INSTALL_DIR@; \ |
|
111 -@WITH_PYTHON24_TRUE@ $(LN_S) -f $(pkgpython24dir)/libgv_python24.so _gv.so; \ |
|
112 -@WITH_PYTHON24_TRUE@ $(LN_S) -f $(pkgpython24dir)/gv.py gv.py;) \ |
|
113 +@WITH_PYTHON24_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython24dir)/libgv_python24.so _gv.so; \ |
|
114 +@WITH_PYTHON24_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython24dir)/gv.py gv.py;) \ |
|
115 @WITH_PYTHON24_TRUE@ else \ |
|
116 @WITH_PYTHON24_TRUE@ echo "Warning: @PYTHON24_INSTALL_DIR@ is not writable."; \ |
|
117 @WITH_PYTHON24_TRUE@ echo "Skipping system installation of python24 binding."; \ |
|
118 @@ -941,8 +941,8 @@ |
|
119 @WITH_PYTHON25_TRUE@ -mkdir -p $(DESTDIR)@PYTHON25_INSTALL_DIR@; |
|
120 @WITH_PYTHON25_TRUE@ if test -w $(DESTDIR)@PYTHON25_INSTALL_DIR@; then \ |
|
121 @WITH_PYTHON25_TRUE@ (cd $(DESTDIR)@PYTHON25_INSTALL_DIR@; \ |
|
122 -@WITH_PYTHON25_TRUE@ $(LN_S) -f $(pkgpython25dir)/libgv_python25.so _gv.so; \ |
|
123 -@WITH_PYTHON25_TRUE@ $(LN_S) -f $(pkgpython25dir)/gv.py gv.py;) \ |
|
124 +@WITH_PYTHON25_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython25dir)/libgv_python25.so _gv.so; \ |
|
125 +@WITH_PYTHON25_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython25dir)/gv.py gv.py;) \ |
|
126 @WITH_PYTHON25_TRUE@ else \ |
|
127 @WITH_PYTHON25_TRUE@ echo "Warning: @PYTHON25_INSTALL_DIR@ is not writable."; \ |
|
128 @WITH_PYTHON25_TRUE@ echo "Skipping system installation of python25 binding."; \ |
|
129 @@ -950,8 +950,8 @@ |
|
130 @WITH_PYTHON26_TRUE@ -mkdir -p $(DESTDIR)@PYTHON26_INSTALL_DIR@; |
|
131 @WITH_PYTHON26_TRUE@ if test -w $(DESTDIR)@PYTHON26_INSTALL_DIR@; then \ |
|
132 @WITH_PYTHON26_TRUE@ (cd $(DESTDIR)@PYTHON26_INSTALL_DIR@; \ |
|
133 -@WITH_PYTHON26_TRUE@ $(LN_S) -f $(pkgpython26dir)/libgv_python26.so _gv.so; \ |
|
134 -@WITH_PYTHON26_TRUE@ $(LN_S) -f $(pkgpython26dir)/gv.py gv.py;) \ |
|
135 +@WITH_PYTHON26_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython26dir)/libgv_python26.so _gv.so; \ |
|
136 +@WITH_PYTHON26_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython26dir)/gv.py gv.py;) \ |
|
137 @WITH_PYTHON26_TRUE@ else \ |
|
138 @WITH_PYTHON26_TRUE@ echo "Warning: @PYTHON26_INSTALL_DIR@ is not writable."; \ |
|
139 @WITH_PYTHON26_TRUE@ echo "Skipping system installation of python26 binding."; \ |
|
140 @@ -959,8 +959,8 @@ |
|
141 @WITH_PYTHON27_TRUE@ -mkdir -p $(DESTDIR)@PYTHON27_INSTALL_DIR@; |
|
142 @WITH_PYTHON27_TRUE@ if test -w $(DESTDIR)@PYTHON27_INSTALL_DIR@; then \ |
|
143 @WITH_PYTHON27_TRUE@ (cd $(DESTDIR)@PYTHON27_INSTALL_DIR@; \ |
|
144 -@WITH_PYTHON27_TRUE@ $(LN_S) -f $(pkgpython27dir)/libgv_python27.so _gv.so; \ |
|
145 -@WITH_PYTHON27_TRUE@ $(LN_S) -f $(pkgpython27dir)/gv.py gv.py;) \ |
|
146 +@WITH_PYTHON27_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython27dir)/libgv_python27.so _gv.so; \ |
|
147 +@WITH_PYTHON27_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgpython27dir)/gv.py gv.py;) \ |
|
148 @WITH_PYTHON27_TRUE@ else \ |
|
149 @WITH_PYTHON27_TRUE@ echo "Warning: @PYTHON27_INSTALL_DIR@ is not writable."; \ |
|
150 @WITH_PYTHON27_TRUE@ echo "Skipping system installation of python27 binding."; \ |
|
151 @@ -968,7 +968,7 @@ |
|
152 @WITH_RUBY_TRUE@ -mkdir -p $(DESTDIR)@RUBY_INSTALL_DIR@; |
|
153 @WITH_RUBY_TRUE@ if test -w $(DESTDIR)@RUBY_INSTALL_DIR@; then \ |
|
154 @WITH_RUBY_TRUE@ (cd $(DESTDIR)@RUBY_INSTALL_DIR@; \ |
|
155 -@WITH_RUBY_TRUE@ $(LN_S) -f $(pkgrubydir)/libgv_ruby.so gv.so;) \ |
|
156 +@WITH_RUBY_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgrubydir)/libgv_ruby.so gv.so;) \ |
|
157 @WITH_RUBY_TRUE@ else \ |
|
158 @WITH_RUBY_TRUE@ echo "Warning: @RUBY_INSTALL_DIR@ is not writable."; \ |
|
159 @WITH_RUBY_TRUE@ echo "Skipping system installation of ruby binding."; \ |
|
160 @@ -976,7 +976,7 @@ |
|
161 @WITH_TCL_TRUE@ -mkdir -p $(DESTDIR)@TCL_INSTALL_DIR@; |
|
162 @WITH_TCL_TRUE@ if test -w $(DESTDIR)@TCL_INSTALL_DIR@/; then \ |
|
163 @WITH_TCL_TRUE@ (cd $(DESTDIR)@TCL_INSTALL_DIR@; \ |
|
164 -@WITH_TCL_TRUE@ $(LN_S) -f $(pkgtcldir) @PACKAGE_NAME@;) \ |
|
165 +@WITH_TCL_TRUE@ $(LN_S) -r -f $(DESTDIR)/$(pkgtcldir) @PACKAGE_NAME@;) \ |
|
166 @WITH_TCL_TRUE@ else \ |
|
167 @WITH_TCL_TRUE@ echo "Warning: @TCL_INSTALL_DIR@ is not writable."; \ |
|
168 @WITH_TCL_TRUE@ echo "Skipping system installation of tcl bindings."; \ |