Re: ClearSilver shared object libraries?
"Rod" <[email protected]> Mon, 30 Jul 2012 17:14:16 -0000
| Newsgroups | gmane.text.clearsilver.general |
|---|---|
| Message-ID | <[email protected]> |
--KWFz3KJzoij36ETPdJJc-z5xZNxVP7MnmbIG8wu Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --- In [email protected], David Jeske <davidj@...> wrote: > If you do it, feel free to submit patches. Patch included. This also tries to fix the problem of cross-compiles that t= ry to run tests on the build hosts, using components created for the non-na= tive target. There is still a problem with the perl tests for cross-develop= ment, but I didn't try to fix that. There is an improvement on making distc= lean, which removes the '.err' files left by running tests. This is the first time I've submitted a patch to any public project. If I'v= e botched it somehow, please be gentle in your chastisement. --- rod. #--------------------< start of cs_solibs.patch >------------------ Only in clearsilver-0.10.5: bin diff -ur clearsilver-0.10.5-ORG/cgi/Makefile clearsilver-0.10.5/cgi/Makefil= e --- clearsilver-0.10.5-ORG/cgi/Makefile 2006-11-09 14:35:37.000000000 -0800 +++ clearsilver-0.10.5/cgi/Makefile 2012-07-30 08:51:02.000000000 -0700 @@ -6,6 +6,7 @@ =20 include $(NEOTONIC_ROOT)/rules.mk =20 +CGI_SOLIB =3D $(LIB_DIR)libneo_cgi.so CGI_LIB =3D $(LIB_DIR)libneo_cgi.a CGI_SRC =3D cgiwrap.c cgi.c html.c date.c rfc2388.c CGI_OBJ =3D $(CGI_SRC:%.c=3D%.o) @@ -21,7 +22,7 @@ =20 DLIBS +=3D -lneo_cgi -lneo_cs -lneo_utl # -lefence =20 -TARGETS =3D $(CGI_LIB) $(STATIC_EXE) $(STATIC_CSO) $(CGICSTEST_EXE) +TARGETS =3D $(CGI_LIB) $(CGI_SOLIB) $(STATIC_EXE) $(STATIC_CSO) $(CGICSTES= T_EXE) =20 all: $(TARGETS) =20 @@ -29,6 +30,9 @@ $(AR) $@ $(CGI_OBJ) $(RANLIB) $@ =20 +$(CGI_SOLIB): $(CGI_OBJ) + $(LDSHARED) -o $@ $(CGI_OBJ) + $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS) $(LD) $@ $(STATIC_OBJ) $(LDFLAGS) $(DLIBS) $(LIBS) =20 Only in clearsilver-0.10.5/cs: libcsTest.so diff -ur clearsilver-0.10.5-ORG/cs/Makefile clearsilver-0.10.5/cs/Makefile --- clearsilver-0.10.5-ORG/cs/Makefile 2007-05-02 17:21:03.000000000 -0700 +++ clearsilver-0.10.5/cs/Makefile 2012-07-30 09:47:30.000000000 -0700 @@ -6,6 +6,8 @@ =20 include $(NEOTONIC_ROOT)/rules.mk =20 + +CS_SOLIB =3D $(LIB_DIR)libneo_cs.so CS_LIB =3D $(LIB_DIR)libneo_cs.a CS_SRC =3D csparse.c CS_OBJ =3D $(CS_SRC:%.c=3D%.o) @@ -24,7 +26,12 @@ =20 LIBS +=3D -lneo_cs -lneo_utl # -lefence =20 -TARGETS =3D $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test +ifeq ($(CC),gcc) + TARGETS =3D $(CS_LIB) $(CS_SOLIB) $(CSTEST_EXE) $(CSR_EXE) test +else + # No testing on cross-compilation TARGETS =3D $(CS_LIB) $(CSTEST_E= XE) $(CSR_EXE) test + TARGETS =3D $(CS_LIB) $(CS_SOLIB) $(CSTEST_EXE) $(CSR_EXE) +endif =20 CS_TESTS =3D test.cs test2.cs test3.cs test4.cs test5.cs test6.cs test7.cs= \ test8.cs test9.cs test10.cs test11.cs test12.cs test13.cs \ @@ -42,6 +49,9 @@ $(AR) $@ $(CS_OBJ) $(RANLIB) $@ =20 +$(CS_SOLIB): $(CS_OBJ) + $(LDSHARED) -o $(CS_SOLIB) $(CS_OBJ) + $(CSTEST_EXE): $(CSTEST_OBJ) $(CS_LIB) $(LD) $@ $(CSTEST_OBJ) $(LDFLAGS) $(LIBS) # -lefence =20 @@ -100,4 +110,4 @@ $(RM) core *.o =20 distclean: - $(RM) Makefile.depends $(TARGETS) core *.o *.out + $(RM) Makefile.depends $(TARGETS) core *.o *.out *.err Only in clearsilver-0.10.5: libs Only in clearsilver-0.10.5: Makefile.depends Only in clearsilver-0.10.5/ruby: hdftest.out Only in clearsilver-0.10.5/ruby: InstalledFiles diff -ur clearsilver-0.10.5-ORG/util/Makefile clearsilver-0.10.5/util/Makef= ile --- clearsilver-0.10.5-ORG/util/Makefile 2005-12-02 02:36:00.0000000= 00 -0800 +++ clearsilver-0.10.5/util/Makefile 2012-07-30 08:44:23.000000000 -0700 @@ -6,6 +6,7 @@ =20 include $(NEOTONIC_ROOT)/rules.mk =20 +UTL_SOLIB =3D $(LIB_DIR)libneo_utl.so UTL_LIB =3D $(LIB_DIR)libneo_utl.a UTL_SRC =3D neo_err.c neo_files.c neo_misc.c neo_rand.c ulist.c neo_hdf.c = \ neo_str.c neo_date.c wildmat.c neo_hash.c $(EXTRA_UTL_SRC) @@ -13,7 +14,7 @@ UTL_OBJ =3D $(UTL_SRC:%.c=3D%.o) $(EXTRA_UTL_OBJS) UTL_HDR =3D $(UTL_SRC:%.c=3D%.h) =20 -TARGETS =3D $(UTL_LIB) +TARGETS =3D $(UTL_LIB) $(UTL_SOLIB) =20 all: $(TARGETS) =20 @@ -21,6 +22,9 @@ $(AR) $@ $(UTL_OBJ) $(RANLIB) $@ =20 +$(UTL_SOLIB): $(UTL_OBJ) + $(LDSHARED) -o $@ $(UTL_OBJ) + install: all $(NEOTONIC_ROOT)/mkinstalldirs $(DESTDIR)$(cs_includedir)/util $(INSTALL) -m 644 $(UTL_HDR) $(DESTDIR)$(cs_includedir)/util #--------------------< end of cs_solibs.patch >------------------ --KWFz3KJzoij36ETPdJJc-z5xZNxVP7MnmbIG8wu Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> </head> <body style="background-color: #fff;"> <span style="display:none"> </span> <!--~-|**|PrettyHtmlStartT|**|-~--> <div id="ygrp-mlmsg" style="position:relative;"> <div id="ygrp-msg" style="z-index: 1;"> <!--~-|**|PrettyHtmlEndT|**|-~--> <div id="ygrp-text" > <p>--- In <a href="mailto:ClearSilver%40yahoogroups.com">[email protected]</a>, David Jeske <davidj@...> wrote:<br> > If you do it, feel free to submit patches.<br> <br> Patch included. This also tries to fix the problem of cross-compiles that try to run tests on the build hosts, using components created for the non-native target. There is still a problem with the perl tests for cross-development, but I didn't try to fix that. There is an improvement on making distclean, which removes the '.err' files left by running tests.<br> <br> This is the first time I've submitted a patch to any public project. If I've botched it somehow, please be gentle in your chastisement.<br> --- rod.<br> <br> #--------------------< start of cs_solibs.patch >------------------<br> Only in clearsilver-0.10.5: bin<br> diff -ur clearsilver-0.10.5-ORG/cgi/Makefile clearsilver-0.10.5/cgi/Makefile<br> --- clearsilver-0.10.5-ORG/cgi/Makefile 2006-11-09 14:35:37.000000000 -0800<br> +++ clearsilver-0.10.5/cgi/Makefile 2012-07-30 08:51:02.000000000 -0700<br> @@ -6,6 +6,7 @@<br> <br> include $(NEOTONIC_ROOT)/rules.mk<br> <br> +CGI_SOLIB = $(LIB_DIR)libneo_cgi.so<br> CGI_LIB = $(LIB_DIR)libneo_cgi.a<br> CGI_SRC = cgiwrap.c cgi.c html.c date.c rfc2388.c<br> CGI_OBJ = $(CGI_SRC:%.c=%.o)<br> @@ -21,7 +22,7 @@<br> <br> DLIBS += -lneo_cgi -lneo_cs -lneo_utl # -lefence<br> <br> -TARGETS = $(CGI_LIB) $(STATIC_EXE) $(STATIC_CSO) $(CGICSTEST_EXE)<br> +TARGETS = $(CGI_LIB) $(CGI_SOLIB) $(STATIC_EXE) $(STATIC_CSO) $(CGICSTEST_EXE)<br> <br> all: $(TARGETS)<br> <br> @@ -29,6 +30,9 @@<br> $(AR) $@ $(CGI_OBJ)<br> $(RANLIB) $@<br> <br> +$(CGI_SOLIB): $(CGI_OBJ)<br> + $(LDSHARED) -o $@ $(CGI_OBJ)<br> +<br> $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS)<br> $(LD) $@ $(STATIC_OBJ) $(LDFLAGS) $(DLIBS) $(LIBS)<br> <br> Only in clearsilver-0.10.5/cs: libcsTest.so<br> diff -ur clearsilver-0.10.5-ORG/cs/Makefile clearsilver-0.10.5/cs/Makefile<br> --- clearsilver-0.10.5-ORG/cs/Makefile 2007-05-02 17:21:03.000000000 -0700<br> +++ clearsilver-0.10.5/cs/Makefile 2012-07-30 09:47:30.000000000 -0700<br> @@ -6,6 +6,8 @@<br> <br> include $(NEOTONIC_ROOT)/rules.mk<br> <br> +<br> +CS_SOLIB = $(LIB_DIR)libneo_cs.so<br> CS_LIB = $(LIB_DIR)libneo_cs.a<br> CS_SRC = csparse.c<br> CS_OBJ = $(CS_SRC:%.c=%.o)<br> @@ -24,7 +26,12 @@<br> <br> LIBS += -lneo_cs -lneo_utl # -lefence<br> <br> -TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test<br> +ifeq ($(CC),gcc)<br> + TARGETS = $(CS_LIB) $(CS_SOLIB) $(CSTEST_EXE) $(CSR_EXE) test<br> +else<br> + # No testing on cross-compilation TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test<br> + TARGETS = $(CS_LIB) $(CS_SOLIB) $(CSTEST_EXE) $(CSR_EXE)<br> +endif<br> <br> CS_TESTS = test.cs test2.cs test3.cs test4.cs test5.cs test6.cs test7.cs \<br> test8.cs test9.cs test10.cs test11.cs test12.cs test13.cs \<br> @@ -42,6 +49,9 @@<br> $(AR) $@ $(CS_OBJ)<br> $(RANLIB) $@<br> <br> +$(CS_SOLIB): $(CS_OBJ)<br> + $(LDSHARED) -o $(CS_SOLIB) $(CS_OBJ)<br> +<br> $(CSTEST_EXE): $(CSTEST_OBJ) $(CS_LIB)<br> $(LD) $@ $(CSTEST_OBJ) $(LDFLAGS) $(LIBS) # -lefence<br> <br> @@ -100,4 +110,4 @@<br> $(RM) core *.o<br> <br> distclean:<br> - $(RM) Makefile.depends $(TARGETS) core *.o *.out<br> + $(RM) Makefile.depends $(TARGETS) core *.o *.out *.err<br> Only in clearsilver-0.10.5: libs<br> Only in clearsilver-0.10.5: Makefile.depends<br> Only in clearsilver-0.10.5/ruby: hdftest.out<br> Only in clearsilver-0.10.5/ruby: InstalledFiles<br> diff -ur clearsilver-0.10.5-ORG/util/Makefile clearsilver-0.10.5/util/Makefile<br> --- clearsilver-0.10.5-ORG/util/Makefile 2005-12-02 02:36:00.000000000 -0800<br> +++ clearsilver-0.10.5/util/Makefile 2012-07-30 08:44:23.000000000 -0700<br> @@ -6,6 +6,7 @@<br> <br> include $(NEOTONIC_ROOT)/rules.mk<br> <br> +UTL_SOLIB = $(LIB_DIR)libneo_utl.so<br> UTL_LIB = $(LIB_DIR)libneo_utl.a<br> UTL_SRC = neo_err.c neo_files.c neo_misc.c neo_rand.c ulist.c neo_hdf.c \<br> neo_str.c neo_date.c wildmat.c neo_hash.c $(EXTRA_UTL_SRC)<br> @@ -13,7 +14,7 @@<br> UTL_OBJ = $(UTL_SRC:%.c=%.o) $(EXTRA_UTL_OBJS)<br> UTL_HDR = $(UTL_SRC:%.c=%.h)<br> <br> -TARGETS = $(UTL_LIB)<br> +TARGETS = $(UTL_LIB) $(UTL_SOLIB)<br> <br> all: $(TARGETS)<br> <br> @@ -21,6 +22,9 @@<br> $(AR) $@ $(UTL_OBJ)<br> $(RANLIB) $@<br> <br> +$(UTL_SOLIB): $(UTL_OBJ)<br> + $(LDSHARED) -o $@ $(UTL_OBJ)<br> +<br> install: all<br> $(NEOTONIC_ROOT)/mkinstalldirs $(DESTDIR)$(cs_includedir)/util<br> $(INSTALL) -m 644 $(UTL_HDR) $(DESTDIR)$(cs_includedir)/util<br> <br> #--------------------< end of cs_solibs.patch >------------------<br> <br> </p> </div> <!--~-|**|PrettyHtmlStart|**|-~--> <div style="color: #fff; height: 0;">__._,_.___</div> <div id="ygrp-actbar" style="clear: both; margin-bottom: 10px; white-space: nowrap; color: #666; padding-top: 15px;"> <div> <a href="mailto:[email protected]?subject=Re%3A%20ClearSilver%20shared%20object%20libraries%3F" style="margin-right: 0; padding-right: 0;"> Reply to <span style="font-weight: 700;">sender</span></a> | <a href="mailto:[email protected]?subject=Re%3A%20ClearSilver%20shared%20object%20libraries%3F"> Reply to <span style="font-weight: 700;">group</span></a> | <a href="http://groups.yahoo.com/group/ClearSilver/post;_ylc=X3oDMTJwcm5oN2lpBF9TAzk3MzU5NzE0BGdycElkAzM1NjQxMzcEZ3Jwc3BJZAMxNzA3MjgxOTQyBG1zZ0lkAzE0NDQEc2VjA2Z0cgRzbGsDcnBseQRzdGltZQMxMzQzNjY4NDYy?act=reply&messageNum=1444">Reply <span style="font-weight: 700;">via web post</span></a> | <a href="http://groups.yahoo.com/group/ClearSilver/post;_ylc=X3oDMTJlcDRlZzhzBF9TAzk3MzU5NzE0BGdycElkAzM1NjQxMzcEZ3Jwc3BJZAMxNzA3MjgxOTQyBHNlYwNmdHIEc2xrA250cGMEc3RpbWUDMTM0MzY2ODQ2Mg--" style="font-weight: 700;">Start a New Topic</a> </div> <a href="http://groups.yahoo.com/group/ClearSilver/message/1442;_ylc=X3oDMTM0dDk4YWxhBF9TAzk3MzU5NzE0BGdycElkAzM1NjQxMzcEZ3Jwc3BJZAMxNzA3MjgxOTQyBG1zZ0lkAzE0NDQEc2VjA2Z0cgRzbGsDdnRwYwRzdGltZQMxMzQzNjY4NDYyBHRwY0lkAzE0NDI-">Messages in this topic</a> (<span style="font-weight: 700;">3</span>) </div> <!------- Start Nav Bar ------> <!-- |**|begin egp html banner|**| --> <div id="ygrp-vital" style="background-color: #e0ecee; font-family: Verdana; font-size: 10px; margin-bottom: 10px; padding: 10px;"> <span id="vithd" style="font-weight: bold; color: #333; text-transform: uppercase; ">Recent Activity:</span> <ul style="list-style-type: none; margin: 0; padding: 0; display: inline;"> </ul> <div style="clear: both; padding-top: 2px; color: #1e66ae;"> <a href="http://groups.yahoo.com/group/ClearSilver;_ylc=X3oDMTJlYjBrcWZrBF9TAzk3MzU5NzE0BGdycElkAzM1NjQxMzcEZ3Jwc3BJZAMxNzA3MjgxOTQyBHNlYwN2dGwEc2xrA3ZnaHAEc3RpbWUDMTM0MzY2ODQ2Mg--" style="text-decoration: none;">Visit Your Group</a> </div> </div> <div id="ft" style="font-family: Arial; font-size: 11px; margin-top: 5px; padding: 0 2px 0 0; clear: both;"> <a href="http://groups.yahoo.com/;_ylc=X3oDMTJkZGdwdGxhBF9TAzk3MzU5NzE0BGdycElkAzM1NjQxMzcEZ3Jwc3BJZAMxNzA3MjgxOTQyBHNlYwNmdHIEc2xrA2dmcARzdGltZQMxMzQzNjY4NDYy" style="float: left;"><img src="http://l.yimg.com/a/i/us/yg/logo/us.gif" height="15" width="137" alt="Yahoo! Groups" style="border: 0;"/></a> <div style="color: #747575; float: right;">Switch to: <a href="mailto:[email protected]?subject=Change Delivery Format: Traditional" style="text-decoration: none;">Text-Only</a>, <a href="mailto:[email protected]?subject=Email Delivery: Digest" class="margin-rt" style="text-decoration: none;">Daily Digest</a> • <a href="mailto:[email protected]?subject=Unsubscribe" style="text-decoration: none;">Unsubscribe</a> • <a href="http://docs.yahoo.com/info/terms/" style="text-decoration: none;">Terms of Use</a></div> </div> <!-- |**|end egp html banner|**| --> </div> <!-- ygrp-msg --> <!-- Sponsor --> <!-- |**|begin egp html banner|**| --> <div id="ygrp-sponsor" style="width:160px; float:right; clear:none; margin:0 0 25px 0; background: #fff;"> <!-- Start Recommendations --> <div id="ygrp-reco"> </div> <!-- End Recommendations --> </div> <!-- |**|end egp html banner|**| --> <div style="clear:both; color: #FFF; font-size:1px;">.</div> </div> <img src="http://geo.yahoo.com/serv?s=97359714/grpId=3564137/grpspId=1707281942/msgId=1444/stime=1343668462/nc1=4507179/nc2=3848643/nc3=4836045" width="1" height="1"> <br> <div style="color: #fff; height: 0;">__,_._,___</div> <!--~-|**|PrettyHtmlEnd|**|-~--> </body> <!--~-|**|PrettyHtmlStart|**|-~--> <head> <style type="text/css"> <!-- #ygrp-mkp { border: 1px solid #d8d8d8; font-family: Arial; margin: 10px 0; padding: 0 10px; } #ygrp-mkp hr { border: 1px solid #d8d8d8; } #ygrp-mkp #hd { color: #628c2a; font-size: 85%; font-weight: 700; line-height: 122%; margin: 10px 0; } #ygrp-mkp #ads { margin-bottom: 10px; } #ygrp-mkp .ad { padding: 0 0; } #ygrp-mkp .ad p { margin: 0; } #ygrp-mkp .ad a { color: #0000ff; text-decoration: none; } #ygrp-sponsor #ygrp-lc { font-family: Arial; } #ygrp-sponsor #ygrp-lc #hd { margin: 10px 0px; font-weight: 700; font-size: 78%; line-height: 122%; } #ygrp-sponsor #ygrp-lc .ad { margin-bottom: 10px; padding: 0 0; } a { color: #1e66ae; } #actions { font-family: Verdana; font-size: 11px; padding: 10px 0; } #activity { background-color: #e0ecee; float: left; font-family: Verdana; font-size: 10px; padding: 10px; } #activity span { font-weight: 700; } #activity span:first-child { text-transform: uppercase; } #activity span a { color: #5085b6; text-decoration: none; } #activity span span { color: #ff7900; } #activity span .underline { text-decoration: underline; } .attach { clear: both; display: table; font-family: Arial; font-size: 12px; padding: 10px 0; width: 400px; } .attach div a { text-decoration: none; } .attach img { border: none; padding-right: 5px; } .attach label { display: block; margin-bottom: 5px; } .attach label a { text-decoration: none; } blockquote { margin: 0 0 0 4px; } .bold { font-family: Arial; font-size: 13px; font-weight: 700; } .bold a { text-decoration: none; } dd.last p a { font-family: Verdana; font-weight: 700; } dd.last p span { margin-right: 10px; font-family: Verdana; font-weight: 700; } dd.last p span.yshortcuts { margin-right: 0; } div.attach-table div div a { text-decoration: none; } div.attach-table { width: 400px; } div.file-title a, div.file-title a:active, div.file-title a:hover, div.file-title a:visited { text-decoration: none; } div.photo-title a, div.photo-title a:active, div.photo-title a:hover, div.photo-title a:visited { text-decoration: none; } div#ygrp-mlmsg #ygrp-msg p a span.yshortcuts { font-family: Verdana; font-size: 10px; font-weight: normal; } .green { color: #628c2a; } .MsoNormal { margin: 0 0 0 0; } o { font-size: 0; } #photos div { float: left; width: 72px; } #photos div div { border: 1px solid #666666; height: 62px; overflow: hidden; width: 62px; } #photos div label { color: #666666; font-size: 10px; overflow: hidden; text-align: center; white-space: nowrap; width: 64px; } #reco-category { font-size: 77%; } #reco-desc { font-size: 77%; } .replbq { margin: 4px; } #ygrp-actbar div a:first-child { /* border-right: 0px solid #000;*/ margin-right: 2px; padding-right: 5px; } #ygrp-mlmsg { font-size: 13px; font-family: Arial, helvetica,clean, sans-serif; *font-size: small; *font: x-small; } #ygrp-mlmsg table { font-size: inherit; font: 100%; } #ygrp-mlmsg select, input, textarea { font: 99% Arial, Helvetica, clean, sans-serif; } #ygrp-mlmsg pre, code { font:115% monospace; *font-size:100%; } #ygrp-mlmsg * { line-height: 1.22em; } #ygrp-mlmsg #logo { padding-bottom: 10px; } #ygrp-mlmsg a { color: #1E66AE; } #ygrp-msg p a { font-family: Verdana; } #ygrp-msg p#attach-count span { color: #1E66AE; font-weight: 700; } #ygrp-reco #reco-head { color: #ff7900; font-weight: 700; } #ygrp-reco { margin-bottom: 20px; padding: 0px; } #ygrp-sponsor #ov li a { font-size: 130%; text-decoration: none; } #ygrp-sponsor #ov li { font-size: 77%; list-style-type: square; padding: 6px 0; } #ygrp-sponsor #ov ul { margin: 0; padding: 0 0 0 8px; } #ygrp-text { font-family: Georgia; } #ygrp-text p { margin: 0 0 1em 0; } #ygrp-text tt { font-size: 120%; } #ygrp-vital ul li:last-child { border-right: none !important; } --> </style> </head> <!--~-|**|PrettyHtmlEnd|**|-~--> </html> <!-- end group email --> --KWFz3KJzoij36ETPdJJc-z5xZNxVP7MnmbIG8wu--